diff --git a/mcp/mobius/opis/data/holders/DataType.java b/mcp/mobius/opis/data/holders/DataType.java index 92c8db5..5a9c2b4 100644 --- a/mcp/mobius/opis/data/holders/DataType.java +++ b/mcp/mobius/opis/data/holders/DataType.java @@ -16,6 +16,7 @@ import mcp.mobius.opis.data.holders.basetypes.TargetEntity; import mcp.mobius.opis.data.holders.basetypes.TicketData; import mcp.mobius.opis.data.holders.newtypes.CachedString; import mcp.mobius.opis.data.holders.newtypes.DataAmountRate; +import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass; import mcp.mobius.opis.data.holders.newtypes.DataByteRate; import mcp.mobius.opis.data.holders.newtypes.DataByteSize; import mcp.mobius.opis.data.holders.newtypes.DataBlockRender; @@ -53,30 +54,31 @@ public enum DataType { TARGETENTITY (TargetEntity.class), TICKETDATA (TicketData.class), - CACHEDSTRING (CachedString.class), - DATAAMOUNTRATE (DataAmountRate.class), - DATABITRATE (DataByteRate.class), - DATABITSIZE (DataByteSize.class), - DATABLOCKRENDER (DataBlockRender.class), - DATABLOCKTICK (DataBlockTick.class), - DATABLOCKTILEENTITY (DataBlockTileEntity.class), - DATACHUNK (DataChunk.class), - DATADIMENSION (DataDimension.class), - DATAENTITY (DataEntity.class), - DATAENTITYPERCLASS(DataEntityPerClass.class), - DATAENTITYRENDER(DataEntityRender.class), - DATAEVENT (DataEvent.class), - DATAHANDLER (DataHandler.class), - DATANETWORKTICK (DataNetworkTick.class), - DATAPACKET (DataPacket.class), - DATAPACKET250 (DataPacket250.class), - DATASTRINGUPD (DataStringUpdate.class), - DATATILEENTITY (DataTileEntity.class), - DATATILEENTITYRENDER(DataTileEntityRender.class), - DATATIMING (DataTiming.class), - DATATIMINGMILLISECOND(DataTimingMillisecond.class), - STATABSTRACT (StatAbstract.class), - STATSCHUNK (StatsChunk.class); + CACHEDSTRING (CachedString.class), + DATAAMOUNTRATE (DataAmountRate.class), + DATABITRATE (DataByteRate.class), + DATABITSIZE (DataByteSize.class), + DATABLOCKRENDER (DataBlockRender.class), + DATABLOCKTICK (DataBlockTick.class), + DATABLOCKTILEENTITY (DataBlockTileEntity.class), + DATABLOCKTILEENTITYPERCLASS (DataBlockTileEntityPerClass.class), + DATACHUNK (DataChunk.class), + DATADIMENSION (DataDimension.class), + DATAENTITY (DataEntity.class), + DATAENTITYPERCLASS (DataEntityPerClass.class), + DATAENTITYRENDER (DataEntityRender.class), + DATAEVENT (DataEvent.class), + DATAHANDLER (DataHandler.class), + DATANETWORKTICK (DataNetworkTick.class), + DATAPACKET (DataPacket.class), + DATAPACKET250 (DataPacket250.class), + DATASTRINGUPD (DataStringUpdate.class), + DATATILEENTITY (DataTileEntity.class), + DATATILEENTITYRENDER (DataTileEntityRender.class), + DATATIMING (DataTiming.class), + DATATIMINGMILLISECOND (DataTimingMillisecond.class), + STATABSTRACT (StatAbstract.class), + STATSCHUNK (StatsChunk.class); private Class clazz; private static HashBiMap bimap = HashBiMap.create(50); diff --git a/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java b/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java new file mode 100644 index 0000000..6a2fd26 --- /dev/null +++ b/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java @@ -0,0 +1,66 @@ +package mcp.mobius.opis.data.holders.newtypes; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import mcp.mobius.opis.data.holders.ISerializable; + +public class DataBlockTileEntityPerClass implements ISerializable, Comparable { + + public int id; + public int meta; + public int amount; + public DataTiming update; + + public DataBlockTileEntityPerClass(){} + + public DataBlockTileEntityPerClass(int id, int meta){ + this.id = id; + this.meta = meta; + this.amount = 0; + this.update = new DataTiming(); + } + + public DataBlockTileEntityPerClass add(){ + this.amount += 1; + return this; + } + + public DataBlockTileEntityPerClass add(Double timing){ + this.amount += 1; + this.update.timing += timing; + + return this; + } + + public DataBlockTileEntityPerClass add(int amount, Double timing){ + this.amount += amount; + this.update.timing += timing; + + return this; + } + + @Override + public void writeToStream(DataOutputStream stream) throws IOException { + stream.writeInt(this.id); + stream.writeInt(this.meta); + stream.writeInt(this.amount); + this.update.writeToStream(stream); + } + + public static DataBlockTileEntityPerClass readFromStream(DataInputStream stream) throws IOException { + DataBlockTileEntityPerClass retVal = new DataBlockTileEntityPerClass(); + retVal.id = stream.readInt(); + retVal.meta = stream.readInt(); + retVal.amount = stream.readInt(); + retVal.update = DataTiming.readFromStream(stream); + return retVal; + } + + @Override + public int compareTo(Object o) { + return this.update.compareTo(((DataBlockTileEntityPerClass)o).update); + } + +} diff --git a/mcp/mobius/opis/data/managers/StringCache.java b/mcp/mobius/opis/data/managers/StringCache.java index 493fcf8..bc94320 100644 --- a/mcp/mobius/opis/data/managers/StringCache.java +++ b/mcp/mobius/opis/data/managers/StringCache.java @@ -68,6 +68,7 @@ public enum StringCache implements IMessageHandler { this.cache.put(data.index, data.str); } catch (IllegalArgumentException e){ this.cache.remove(data.index); + this.cache.inverse().remove(data.str); this.cache.put(data.index, data.str); } break; @@ -81,6 +82,7 @@ public enum StringCache implements IMessageHandler { this.cache.put(data.index, data.str); } catch (IllegalArgumentException e){ this.cache.remove(data.index); + this.cache.inverse().remove(data.str); this.cache.put(data.index, data.str); } } diff --git a/mcp/mobius/opis/data/managers/TileEntityManager.java b/mcp/mobius/opis/data/managers/TileEntityManager.java index cfade38..3564150 100644 --- a/mcp/mobius/opis/data/managers/TileEntityManager.java +++ b/mcp/mobius/opis/data/managers/TileEntityManager.java @@ -6,11 +6,14 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import com.google.common.collect.HashBasedTable; + import mcp.mobius.mobiuscore.profiler.ProfilerSection; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk; import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntity; +import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass; import mcp.mobius.opis.data.holders.newtypes.DataTileEntity; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.stats.StatsChunk; @@ -157,4 +160,41 @@ public enum TileEntityManager { return orphans; } + + public ArrayList getCumulativeAmountTileEntities(){ + HashBasedTable data = HashBasedTable.create(); + + for (WorldServer world : DimensionManager.getWorlds()){ + for (Object o : world.loadedTileEntityList){ + TileEntity tileEntity = (TileEntity)o; + int id = world.getBlockId(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); + int meta = world.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); + + if (!data.contains(id, meta)) + data.put(id, meta, new DataBlockTileEntityPerClass(id, meta)); + + data.get(id, meta).add(); + } + } + + return new ArrayList(data.values()); + } + + public ArrayList getCumulativeTimingTileEntities(){ + HashBasedTable data = HashBasedTable.create(); + + for (CoordinatesBlock coord : ((ProfilerTileEntityUpdate)ProfilerSection.TILEENT_UPDATETIME.getProfiler()).data.keySet()){ + World world = DimensionManager.getWorld(coord.dim); + int id = world.getBlockId(coord.x, coord.y, coord.z); + int meta = world.getBlockMetadata(coord.x, coord.y, coord.z); + + if (!data.contains(id, meta)) + data.put(id, meta, new DataBlockTileEntityPerClass(id, meta)); + + data.get(id, meta).add(((ProfilerTileEntityUpdate)ProfilerSection.TILEENT_UPDATETIME.getProfiler()).data.get(coord).getGeometricMean()); + + } + + return new ArrayList(data.values()); + } } diff --git a/mcp/mobius/opis/helpers/ModIdentification.java b/mcp/mobius/opis/helpers/ModIdentification.java index a69154b..b18e383 100644 --- a/mcp/mobius/opis/helpers/ModIdentification.java +++ b/mcp/mobius/opis/helpers/ModIdentification.java @@ -119,5 +119,29 @@ public class ModIdentification { return mc; return null; - } + } + + public static String getStackName(int id, int meta){ + ItemStack is; + String name = String.format("te.%d.%d", id, meta); + + try{ + is = new ItemStack(id, 1, meta); + name = is.getDisplayName(); + } catch (Exception e) { } + + return name; + } + + public static String getModStackName(int id, int meta){ + ItemStack is; + String modID = ""; + + try{ + is = new ItemStack(id, 1, meta); + modID = ModIdentification.idFromStack(is); + } catch (Exception e) { } + + return modID; + } } diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index eb7cfb4..4814fe5 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -75,7 +75,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; -@Mod(modid="Opis", name="Opis", version="1.2.2_dev6") +@Mod(modid="Opis", name="Opis", version="1.2.2_dev7") @NetworkMod(channels={"Opis", "Opis_Chunk"},clientSideRequired=false, serverSideRequired=false, connectionHandler=OpisConnectionHandler.class, packetHandler=OpisPacketHandler.class) public class modOpis { diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index e35ab52..e7567ff 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -27,6 +27,7 @@ import mcp.mobius.opis.data.holders.basetypes.SerialInt; import mcp.mobius.opis.data.holders.basetypes.SerialLong; import mcp.mobius.opis.data.holders.basetypes.TicketData; import mcp.mobius.opis.data.holders.newtypes.DataBlockTick; +import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass; import mcp.mobius.opis.data.holders.newtypes.DataEntity; import mcp.mobius.opis.data.holders.newtypes.DataEntityPerClass; import mcp.mobius.opis.data.holders.newtypes.DataEvent; @@ -214,6 +215,7 @@ public class OpisPacketHandler implements IPacketHandler { ArrayList timingHandlers = TickHandlerManager.getCumulatedStatsServer(); ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); ArrayList timingEntsClass = EntityManager.INSTANCE.getTotalPerClass(); + ArrayList timingTEsClass = TileEntityManager.INSTANCE.getCumulativeTimingTileEntities(); DataTiming totalTimeTE = TileEntityManager.INSTANCE.getTotalUpdateTime(); DataTiming totalTimeEnt = EntityManager.INSTANCE.getTotalUpdateTime(); @@ -230,6 +232,7 @@ public class OpisPacketHandler implements IPacketHandler { OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_HANDLERS, timingHandlers), player); OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_ENTITIES, timingEntities), player); OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_TILEENTS, timingTileEnts), player); + OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_TILEENTS_PER_CLASS, timingTEsClass), player); OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), player); OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_EVENTS, timingEvents), player); OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_ENTITIES_PER_CLASS, timingEntsClass), player); diff --git a/mcp/mobius/opis/network/ServerMessageHandler.java b/mcp/mobius/opis/network/ServerMessageHandler.java index cb554da..899a953 100644 --- a/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/mcp/mobius/opis/network/ServerMessageHandler.java @@ -131,6 +131,10 @@ public class ServerMessageHandler { OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_AMOUNT_ENTITIES, ents), (Player)player); } + else if (maintype == Message.LIST_AMOUNT_TILEENTS){ + OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_AMOUNT_TILEENTS, TileEntityManager.INSTANCE.getCumulativeAmountTileEntities()), (Player)player); + } + else if (maintype == Message.COMMAND_FILTERING_TRUE){ PlayerTracker.instance().filteredAmount.put(name, true); } diff --git a/mcp/mobius/opis/network/enums/Message.java b/mcp/mobius/opis/network/enums/Message.java index 0e7a4f9..31d1055 100644 --- a/mcp/mobius/opis/network/enums/Message.java +++ b/mcp/mobius/opis/network/enums/Message.java @@ -16,12 +16,14 @@ public enum Message { LIST_CHUNK_LOADED_CLEAR, LIST_CHUNK_TICKETS, LIST_TIMING_TILEENTS, + LIST_TIMING_TILEENTS_PER_CLASS, LIST_TIMING_ENTITIES, LIST_TIMING_ENTITIES_PER_CLASS, LIST_TIMING_HANDLERS, LIST_TIMING_CHUNK, LIST_TIMING_EVENTS, LIST_AMOUNT_ENTITIES, + LIST_AMOUNT_TILEENTS, LIST_PLAYERS (EnumSet.of(SelectedTab.PLAYERS)), LIST_DIMENSION_DATA (EnumSet.of(SelectedTab.DIMENSIONS)), LIST_PACKETS_OUTBOUND (EnumSet.of(SelectedTab.PACKETOUTBOUND)), diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index c353870..03278e6 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -48,7 +48,9 @@ import mcp.mobius.opis.swing.panels.timingserver.PanelTimingEntitiesPerClass; import mcp.mobius.opis.swing.panels.timingserver.PanelTimingEvents; import mcp.mobius.opis.swing.panels.timingserver.PanelTimingHandlers; import mcp.mobius.opis.swing.panels.timingserver.PanelTimingTileEnts; +import mcp.mobius.opis.swing.panels.timingserver.PanelTimingTileEntsPerClass; import mcp.mobius.opis.swing.panels.tracking.PanelAmountEntities; +import mcp.mobius.opis.swing.panels.tracking.PanelAmountTileEnts; import mcp.mobius.opis.swing.panels.tracking.PanelDimensions; import mcp.mobius.opis.swing.panels.tracking.PanelPlayers; @@ -77,11 +79,13 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ TabPanelRegistrar.INSTANCE.registerSection("Tracking"); IMessageHandler panelPlayers = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelPlayers(), "Players", "Tracking"); - IMessageHandler panelAmountEntities = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelAmountEntities(),"Entity amount", "Tracking"); + IMessageHandler panelAmountEntities = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelAmountEntities(),"Entities", "Tracking"); + IMessageHandler panelAmountTileEnts = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelAmountTileEnts(),"Tile Entities", "Tracking"); IMessageHandler panelDimensions = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelDimensions(), "Dimensions", "Tracking"); TabPanelRegistrar.INSTANCE.registerSection("Server timing"); IMessageHandler panelTimingTileEnts = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingTileEnts(),"Tile Entities", "Server timing"); + IMessageHandler panelTimingTileEntsPerClass = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingTileEntsPerClass(),"Tile Entities [Type]", "Server timing"); IMessageHandler panelTimingEntities = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingEntities(),"Entities", "Server timing"); IMessageHandler panelTimingEntPerClass = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingEntitiesPerClass(),"Entities [Type]", "Server timing"); IMessageHandler panelTimingHandlers = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingHandlers(),"Handlers", "Server timing"); @@ -105,6 +109,7 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_PLAYERS, panelPlayers); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_AMOUNT_ENTITIES, panelAmountEntities); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_AMOUNT_TILEENTS, panelAmountTileEnts); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_TILEENTS, panelTimingTileEnts); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_TILEENTS, panelTimingTileEnts); @@ -123,6 +128,11 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_START, panelTimingEntPerClass); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STOP, panelTimingEntPerClass); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_RUNNING, panelTimingEntPerClass); + + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_TILEENTS_PER_CLASS, panelTimingTileEntsPerClass); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_START, panelTimingTileEntsPerClass); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STOP, panelTimingTileEntsPerClass); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_RUNNING, panelTimingTileEntsPerClass); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_HANDLERS, panelTimingHandlers); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_HANDLERS, panelTimingHandlers); diff --git a/mcp/mobius/opis/swing/SelectedTab.java b/mcp/mobius/opis/swing/SelectedTab.java index fe6647e..a7d7b77 100644 --- a/mcp/mobius/opis/swing/SelectedTab.java +++ b/mcp/mobius/opis/swing/SelectedTab.java @@ -2,6 +2,7 @@ package mcp.mobius.opis.swing; public enum SelectedTab { AMOUNTENTS, + AMOUNTTES, DIMENSIONS, PACKETS, PLAYERS, @@ -13,6 +14,7 @@ public enum SelectedTab { TIMINGENTITESPERCLASS, TIMINGHANDLERS, TIMINGTILEENTS, + TIMINGTILEENTSPERCLASS, TIMINGEVENTS, PACKETINBOUND, PACKETOUTBOUND, diff --git a/mcp/mobius/opis/swing/actions/ActionAmountTileEnts.java b/mcp/mobius/opis/swing/actions/ActionAmountTileEnts.java new file mode 100644 index 0000000..0f3de94 --- /dev/null +++ b/mcp/mobius/opis/swing/actions/ActionAmountTileEnts.java @@ -0,0 +1,46 @@ +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.SelectedTab; +import mcp.mobius.opis.swing.SwingUI; +import mcp.mobius.opis.swing.panels.tracking.PanelAmountEntities; +import mcp.mobius.opis.swing.panels.tracking.PanelAmountTileEnts; +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; +import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass; +import mcp.mobius.opis.data.holders.stats.StatAbstract; +import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; +import mcp.mobius.opis.swing.widgets.JTableStats; + +public class ActionAmountTileEnts implements ActionListener{ + + @Override + public void actionPerformed(ActionEvent e) { + PanelAmountTileEnts panel = (PanelAmountTileEnts)TabPanelRegistrar.INSTANCE.getTab(SelectedTab.AMOUNTTES); + + /* + JTableStats table = panel.getTable(); + if (table == null || table.getSelectedRow() == -1) return; + int indexData = table.convertRowIndexToModel(table.getSelectedRow()); + DataBlockTileEntityPerClass data = (DataBlockTileEntityPerClass)table.getTableData().get(indexData); + */ + + if (e.getSource() == panel.getBtnRefresh()){ + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(Message.LIST_AMOUNT_TILEENTS)); + } + + } +} diff --git a/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEnts.java b/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEnts.java index a7b2edf..9d25c61 100644 --- a/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEnts.java +++ b/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEnts.java @@ -94,16 +94,8 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{ for (Object o : rawdata.array){ DataBlockTileEntity data = (DataBlockTileEntity)o; - ItemStack is; - String name = String.format("te.%d.%d", data.id, data.meta); - String modID = ""; - - try{ - is = new ItemStack(data.id, 1, data.meta); - name = is.getDisplayName(); - modID = ModIdentification.idFromStack(is); - } catch (Exception e) { } - + String name = ModIdentification.getStackName(data.id, data.meta); + String modID = ModIdentification.getModStackName(data.id, data.meta); model.addRow(new Object[] { name, modID, diff --git a/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEntsPerClass.java b/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEntsPerClass.java new file mode 100644 index 0000000..c718c23 --- /dev/null +++ b/mcp/mobius/opis/swing/panels/timingserver/PanelTimingTileEntsPerClass.java @@ -0,0 +1,105 @@ +package mcp.mobius.opis.swing.panels.timingserver; + +import java.util.HashMap; + +import javax.swing.JButton; +import javax.swing.JScrollPane; +import javax.swing.SwingConstants; +import javax.swing.table.DefaultTableModel; + +import net.miginfocom.swing.MigLayout; +import mcp.mobius.opis.api.ITabPanel; +import mcp.mobius.opis.data.holders.newtypes.CachedString; +import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass; +import mcp.mobius.opis.data.holders.newtypes.DataTiming; +import mcp.mobius.opis.helpers.ModIdentification; +import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.server.NetDataRaw; +import mcp.mobius.opis.swing.SelectedTab; +import mcp.mobius.opis.swing.actions.ActionRunOpis; +import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; +import mcp.mobius.opis.swing.widgets.JTableStats; + +public class PanelTimingTileEntsPerClass extends JPanelMsgHandler implements ITabPanel { + private JButton btnRun; + + public PanelTimingTileEntsPerClass() { + setLayout(new MigLayout("", "[grow][]", "[][grow]")); + + btnRun = new JButton("Run Opis"); + add(btnRun, "cell 1 0"); + btnRun.addActionListener(new ActionRunOpis()); + + JScrollPane scrollPane = new JScrollPane(); + add(scrollPane, "cell 0 1 2 1,grow"); + + table = new JTableStats( + new String[] {"Name", "Mod", "Amount", "Timing", "Mean value"}, + new Class[] {String.class, String.class, Integer.class, DataTiming.class, DataTiming.class}, + new int[] {SwingConstants.LEFT, SwingConstants.CENTER, SwingConstants.CENTER, SwingConstants.CENTER, SwingConstants.CENTER} + ); + scrollPane.setViewportView(table); + } + + @Override + public boolean handleMessage(Message msg, NetDataRaw rawdata) { + switch(msg){ + + case LIST_TIMING_TILEENTS_PER_CLASS:{ + + ((JTableStats)this.getTable()).setTableData(rawdata.array); + + DefaultTableModel model = (DefaultTableModel)table.getModel(); + int row = this.getTable().clearTable(DataBlockTileEntityPerClass.class); + + HashMap cumData = new HashMap(); + + for (Object o : rawdata.array){ + DataBlockTileEntityPerClass data = (DataBlockTileEntityPerClass)o; + String name = ModIdentification.getStackName(data.id, data.meta); + + if (!cumData.containsKey(name)) + cumData.put(name, new DataBlockTileEntityPerClass(data.id, data.meta)); + + cumData.get(name).add(data.amount, data.update.timing); + } + + for (String s : cumData.keySet()){ + String name = s; + String modID = ModIdentification.getModStackName(cumData.get(s).id, cumData.get(s).meta); + model.addRow(new Object[] {name, modID, cumData.get(s).amount, cumData.get(s).update, new DataTiming(cumData.get(s).update.timing / cumData.get(s).amount)}); + } + + this.getTable().dataUpdated(row); + + break; + } + + case STATUS_START:{ + this.getBtnRun().setText("Running..."); + break; + } + case STATUS_STOP:{ + this.getBtnRun().setText("Run Opis"); + break; + } + case STATUS_RUNNING:{ + this.getBtnRun().setText("Running..."); + break; + } + default: + return false; + + } + return true; + } + + @Override + public SelectedTab getSelectedTab() { + return SelectedTab.TIMINGTILEENTSPERCLASS; + } + + public JButton getBtnRun() { + return btnRun; + } +} diff --git a/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java b/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java new file mode 100644 index 0000000..630ae5a --- /dev/null +++ b/mcp/mobius/opis/swing/panels/tracking/PanelAmountTileEnts.java @@ -0,0 +1,104 @@ +package mcp.mobius.opis.swing.panels.tracking; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.HashMap; + +import mcp.mobius.opis.api.ITabPanel; +import mcp.mobius.opis.data.holders.basetypes.AmountHolder; +import mcp.mobius.opis.data.holders.newtypes.DataBlockTileEntityPerClass; +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.SelectedTab; +import mcp.mobius.opis.swing.actions.ActionAmountEntities; +import mcp.mobius.opis.swing.actions.ActionAmountTileEnts; +import mcp.mobius.opis.swing.widgets.JButtonAccess; +import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; +import mcp.mobius.opis.swing.widgets.JTableStats; +import net.miginfocom.swing.MigLayout; + +import javax.swing.JCheckBox; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.ListSelectionModel; +import javax.swing.SwingConstants; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.DefaultTableModel; + +public class PanelAmountTileEnts extends JPanelMsgHandler implements ITabPanel{ + private JButtonAccess btnRefresh; + + + /** + * Create the panel. + */ + public PanelAmountTileEnts() { + setLayout(new MigLayout("", "[][][grow][]", "[][grow][]")); + + btnRefresh = new JButtonAccess("Refresh", AccessLevel.NONE); + add(btnRefresh, "cell 3 0"); + btnRefresh.addActionListener(new ActionAmountTileEnts()); + + JScrollPane scrollPane = new JScrollPane(); + add(scrollPane, "cell 0 1 4 1,grow"); + + table = new JTableStats( + new String[] {"Name", "Mod", "Amount"}, + new Class[] {String.class, String.class, Integer.class}, + new int[] {SwingConstants.LEFT, SwingConstants.CENTER, SwingConstants.CENTER} + ); + scrollPane.setViewportView(table); + } + + public JButton getBtnRefresh() {return btnRefresh;} + + @Override + public boolean handleMessage(Message msg, NetDataRaw rawdata) { + switch(msg){ + case LIST_AMOUNT_TILEENTS:{ + + ((JTableStats)this.getTable()).setTableData(rawdata.array); + + DefaultTableModel model = (DefaultTableModel)table.getModel(); + int row = this.getTable().clearTable(DataBlockTileEntityPerClass.class); + + HashMap cumData = new HashMap(); + + for (Object o : rawdata.array){ + DataBlockTileEntityPerClass data = (DataBlockTileEntityPerClass)o; + String name = ModIdentification.getStackName(data.id, data.meta); + + if (!cumData.containsKey(name)) + cumData.put(name, new DataBlockTileEntityPerClass(data.id, data.meta)); + + cumData.get(name).add(data.amount, data.update.timing); + } + + for (String s : cumData.keySet()){ + String name = s; + String modID = ModIdentification.getModStackName(cumData.get(s).id, cumData.get(s).meta); + model.addRow(new Object[] {name, modID, cumData.get(s).amount}); + } + + this.getTable().dataUpdated(row); + + break; + } + default: + return false; + + } + return true; + } + + @Override + public SelectedTab getSelectedTab() { + return SelectedTab.AMOUNTTES; + } +}