Added timer entity top list. (/opis_ent)

This commit is contained in:
ProfMobius committed 2013-12-06 17:38:51 +01:00
1 parent e2c134295e
commit cd05b01fc8
10 files changed
+165 -30

No files matched your search

@@ -6,6 +6,7 @@ import java.util.HashMap;
import mcp.mobius.opis.data.EntityManager;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.network.server.Packet_DataScreenTimingEntities;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -13,7 +14,7 @@ import net.minecraft.network.MemoryConnection;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.dedicated.DedicatedServer;
public class CommandEntities extends CommandBase {
public class CommandTimingEntities extends CommandBase {
@Override
public String getCommandName() {
@@ -27,30 +28,18 @@ public class CommandEntities extends CommandBase {
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
double totalTime = 0;
System.out.printf("=====\n");
/*
for (Integer index : EntityManager.stats.keySet()){
//System.out.printf("%s\n", EntityManager.stats.get(index));
totalTime += EntityManager.stats.get(index).getGeometricMean();
ArrayList<EntityStats> ents = new ArrayList<EntityStats>();
if (astring.length == 0){
ents = EntityManager.getTopEntities(20);
}
*/
/*
for (EntityStats stats : EntityManager.getTopEntities(20)){
System.out.printf("%s\n", stats);
}
*/
//System.out.printf("Total entity update time : %.3f \u00B5s\n", totalTime);
HashMap<CoordinatesChunk, ArrayList<EntityStats>> entities = EntityManager.getEntitiesPerChunkInDim(0);
for (CoordinatesChunk chunk : entities.keySet()){
System.out.printf("%s %s\n", chunk, entities.get(chunk).size());
for (EntityStats stats : entities.get(chunk)){
System.out.printf("\t%s\n", stats.getName());
}
else{
try{
ents = EntityManager.getTopEntities(Integer.valueOf(astring[0]));
} catch (Exception e) {return;}
}
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataScreenTimingEntities.create(ents));
}
@Override
@@ -12,7 +12,7 @@ import net.minecraft.network.MemoryConnection;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.dedicated.DedicatedServer;
public class CommandTileEntitiesList extends CommandBase {
public class CommandTimingTileEntities extends CommandBase {
@Override
public String getCommandName() {
@@ -39,6 +39,8 @@ public class EntityStats implements ISerializable, Comparable {
public String getName(){ return this.name; };
public int getID(){ return this.entId; }
public double getGeometricMean(){
if (geomMean != null)
return geomMean;
@@ -0,0 +1,77 @@
package mcp.mobius.opis.gui.screens;
import java.util.ArrayList;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import cpw.mods.fml.common.network.PacketDispatcher;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.gui.events.MouseEvent;
import mcp.mobius.opis.gui.interfaces.CType;
import mcp.mobius.opis.gui.interfaces.IWidget;
import mcp.mobius.opis.gui.interfaces.WAlign;
import mcp.mobius.opis.gui.widgets.WidgetGeometry;
import mcp.mobius.opis.gui.widgets.tableview.TableRow;
import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
import mcp.mobius.opis.network.client.Packet_ReqTeleport;
import mcp.mobius.opis.data.holders.EntityStats;
public class ScreenEntity extends ScreenBase {
public class EntitiesTable extends ViewTable{
public EntitiesTable(IWidget parent) {
super(parent);
}
@Override
public void onMouseClick(MouseEvent event){
TableRow row = this.getRow(event.x, event.y);
if (row != null){
CoordinatesBlock coord = ((EntityStats)row.getObject()).getCoord();
PacketDispatcher.sendPacketToServer(Packet_ReqTeleport.create(coord));
Minecraft.getMinecraft().setIngameFocus();
}
}
}
public ScreenEntity(GuiScreen parent, ArrayList<EntityStats> stat) {
super(parent);
EntitiesTable table = (EntitiesTable)this.getRoot().addWidget("Table", new EntitiesTable(null));
table.setGeometry(new WidgetGeometry(50.0, 50.0, 80.0, 80.0,CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER));
table.setColumnsAlign(WAlign.CENTER, WAlign.CENTER, WAlign.CENTER, WAlign.CENTER, WAlign.CENTER)
//.setColumnsTitle("\u00a7a\u00a7oType", "\u00a7a\u00a7oPos", "\u00a7a\u00a7oUpdate Time")
.setColumnsTitle("Type", "ID", "Dim", "Pos", "Update Time")
.setColumnsWidth(35, 15, 15, 15, 20)
.setRowColors(0xff808080, 0xff505050)
.setFontSize(1.0f);
for (EntityStats data : stat){
String[] namelst = data.getName().split("\\.");
String name = namelst[namelst.length - 1];
if(modOpis.microseconds)
table.addRow(data,
name,
String.valueOf(data.getID()),
String.format("%3d", data.getCoord().dim),
String.format("[ %4d %4d %4d ]", data.getCoord().x, data.getCoord().y, data.getCoord().z),
String.format("%.3f \u00B5s",data.getGeometricMean()));
else
table.addRow(data,
name,
String.valueOf(data.getID()),
String.format("%3d", data.getCoord().dim),
String.format("[ %4d %4d %4d ]", data.getCoord().x, data.getCoord().y, data.getCoord().z),
String.format("%.5f ms",data.getGeometricMean()/1000.0));
}
}
}
+4 -4
View File
@@ -11,14 +11,14 @@ import mcp.mobius.opis.client.OpisClientTickHandler;
import mcp.mobius.opis.commands.CommandChunkDump;
import mcp.mobius.opis.commands.CommandChunkList;
import mcp.mobius.opis.commands.CommandDataDump;
import mcp.mobius.opis.commands.CommandEntities;
import mcp.mobius.opis.commands.CommandTimingEntities;
import mcp.mobius.opis.commands.CommandFrequency;
import mcp.mobius.opis.commands.CommandMeanModTime;
import mcp.mobius.opis.commands.CommandStart;
import mcp.mobius.opis.commands.CommandStop;
import mcp.mobius.opis.commands.CommandTPS;
import mcp.mobius.opis.commands.CommandTicks;
import mcp.mobius.opis.commands.CommandTileEntitiesList;
import mcp.mobius.opis.commands.CommandTimingTileEntities;
import mcp.mobius.opis.data.EntityProfiler;
import mcp.mobius.opis.data.TileEntityProfiler;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
@@ -97,11 +97,11 @@ public class modOpis {
event.registerServerCommand(new CommandFrequency());
event.registerServerCommand(new CommandStart());
event.registerServerCommand(new CommandStop());
event.registerServerCommand(new CommandTileEntitiesList());
event.registerServerCommand(new CommandTimingTileEntities());
event.registerServerCommand(new CommandMeanModTime());
event.registerServerCommand(new CommandDataDump());
event.registerServerCommand(new CommandTicks());
event.registerServerCommand(new CommandEntities());
event.registerServerCommand(new CommandTimingEntities());
//event.registerServerCommand(new CommandTPS());
GameRegistry.registerPlayerTracker(new OpisPlayerTracker());
@@ -25,6 +25,7 @@ import mcp.mobius.opis.network.server.Packet_ChunkTopList;
import mcp.mobius.opis.network.server.Packet_Chunks;
import mcp.mobius.opis.network.server.Packet_DataListChunkEntities;
import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities;
import mcp.mobius.opis.network.server.Packet_DataScreenTimingEntities;
import mcp.mobius.opis.network.server.Packet_LoadedChunks;
import mcp.mobius.opis.network.server.Packet_MeanTime;
import mcp.mobius.opis.network.server.Packet_ModMeanTime;
@@ -130,6 +131,11 @@ public class OpisPacketHandler implements IPacketHandler {
OverlayEntityPerChunk.instance().setupEntTable();
}
else if (header == Packets.DATA_SCREEN_TIMING_ENTITIES){
Packet_DataScreenTimingEntities castedPacket = new Packet_DataScreenTimingEntities(packet);
modOpis.proxy.displayEntityList(castedPacket.entities);
}
}
void onPacketToServer(INetworkManager manager, Packet250CustomPayload packet, Player player, Byte header) {
+3 -2
View File
@@ -24,9 +24,10 @@ public class Packets {
public static byte REQ_TELEPORT = 0x30; // C => S
/* Entities packets */
public static byte DATA_OVERLAY_CHUNK_ENTITIES = 0x40;
public static byte DATA_LIST_CHUNK_ENTITIES = 0x41;
public static byte DATA_LIST_CHUNK_ENTITIES = 0x41;
public static byte DATA_SCREEN_TIMING_ENTITIES = 0x42;
public static byte REQ_DATA = 0x50; // C => S
}
@@ -0,0 +1,50 @@
package mcp.mobius.opis.network.server;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import net.minecraft.network.packet.Packet250CustomPayload;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.network.Packet251Extended;
import mcp.mobius.opis.network.Packets;
public class Packet_DataScreenTimingEntities {
public byte header;
public ArrayList<EntityStats> entities = new ArrayList<EntityStats>();
public Packet_DataScreenTimingEntities(Packet250CustomPayload packet) {
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
try{
this.header = inputStream.readByte();
int ndata = inputStream.readInt();
for (int i = 0; i < ndata; i++)
entities.add(EntityStats.readFromStream(inputStream));
} catch (IOException e){}
}
public static Packet250CustomPayload create(ArrayList<EntityStats> stats){
Packet251Extended packet = new Packet251Extended();
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
DataOutputStream outputStream = new DataOutputStream(bos);
try{
outputStream.writeByte(Packets.DATA_SCREEN_TIMING_ENTITIES);
outputStream.writeInt(stats.size());
for (EntityStats data : stats)
data.writeToStream(outputStream);
}catch(IOException e){}
packet.channel = "Opis";
packet.data = bos.toByteArray();
packet.length = bos.size();
return packet;
}
}
+8
View File
@@ -9,12 +9,14 @@ import net.minecraft.util.ResourceLocation;
import mapwriter.api.MwAPI;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.holders.ChunkStats;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.ModStats;
import mcp.mobius.opis.gui.font.Fonts;
import mcp.mobius.opis.gui.font.TrueTypeFont;
import mcp.mobius.opis.gui.screens.ScreenBase;
import mcp.mobius.opis.gui.screens.ScreenChunks;
import mcp.mobius.opis.gui.screens.ScreenEntity;
import mcp.mobius.opis.gui.screens.ScreenMods;
import mcp.mobius.opis.gui.screens.ScreenTileEntity;
import mcp.mobius.opis.overlay.OverlayLoadedChunks;
@@ -49,6 +51,12 @@ public class ProxyClient extends ProxyServer {
screenTEs.display();
}
@Override
public void displayEntityList(ArrayList<EntityStats> stats){
ScreenBase screenEnts = new ScreenEntity(null, stats);
screenEnts.display();
}
@Override
public void displayChunkList(ArrayList<ChunkStats> stats){
ScreenBase screenChunks = new ScreenChunks(null, stats);
+2
View File
@@ -5,6 +5,7 @@ import java.util.HashMap;
import cpw.mods.fml.common.network.Player;
import mcp.mobius.opis.data.holders.ChunkStats;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.ModStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.overlay.OverlayStatus;
@@ -15,6 +16,7 @@ public class ProxyServer {
public void init(){}
public void displayTileEntityList(ArrayList<TileEntityStats> stats){}
public void displayEntityList(ArrayList<EntityStats> stats){}
public void displayChunkList(ArrayList<ChunkStats> stats){}
public void displayModList(ArrayList<ModStats> stats){}