Added a list of entities in chunks (displayed as a table)

This commit is contained in:
ProfMobius committed 2013-10-29 19:38:55 +01:00
1 parent e85bd42e6e
commit 4ff65462ab
8 files changed
+66 -25

No files matched your search

+3 -3
View File
@@ -46,8 +46,8 @@ public class ViewTable extends WidgetBase{
String[] texts;
WAlign[] aligns;
boolean init = false;
int bgcolor1 = 0x50505050;
int bgcolor2 = 0x50505050;
int bgcolor1 = 0xff505050;
int bgcolor2 = 0xff505050;
public Row(IWidget parent){
@@ -189,7 +189,7 @@ public class ViewTable extends WidgetBase{
newRow.setColumnsText(strings);
newRow.setColumnsAlign(this.aligns);
if(this.nrows % 2 == 1)
newRow.setColors(0x50808080, 0x50808080);
newRow.setColors(0xff808080, 0xff808080);
newRow.setGeometry(new WidgetGeometry(0.0, 16*this.nrows, 100.0, 16, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP));
tableLayout.addWidget(String.format("Row_%03d", this.nrows), newRow);
+2 -13
View File
@@ -3,21 +3,13 @@ package mcp.mobius.opis.network;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.Set;
import java.util.logging.Level;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.ChunksData;
import mcp.mobius.opis.data.TileEntitiesData;
import mcp.mobius.opis.data.TileEntityStatsData;
import mcp.mobius.opis.overlay.OverlayLoadedChunks;
import mcp.mobius.opis.overlay.OverlayMeanTime;
import mcp.mobius.opis.overlay.OverlayStatus;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.WorldServer;
import net.minecraftforge.common.DimensionManager;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
@@ -42,10 +34,7 @@ public class OpisPacketHandler implements IPacketHandler {
else if (header == Packets.TILEENTITIES_LIST){
Packet_TileEntitiesList castedPacket = new Packet_TileEntitiesList(packet);
/*
for (TileEntityStatsData data : castedPacket.entities)
System.out.printf("%s %.5f ms\n", data.getType(), data.getGeometricMean() / 1000.0);
*/
OverlayMeanTime.instance().setupTable(castedPacket.entities);
}
// SERVER RECEIVED PACKETS
@@ -10,7 +10,6 @@ import java.util.HashMap;
import mcp.mobius.opis.data.ChunkStatsData;
import mcp.mobius.opis.data.CoordinatesChunk;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.world.ChunkCoordIntPair;
public class Packet_MeanTime {
@@ -2,8 +2,6 @@ package mcp.mobius.opis.overlay;
import java.awt.Point;
import java.util.ArrayList;
import java.util.HashMap;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.world.ChunkCoordIntPair;
import mapwriter.api.IMwChunkOverlay;
+60 -1
View File
@@ -5,12 +5,21 @@ import java.util.ArrayList;
import net.minecraft.util.MathHelper;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mapwriter.api.IMwChunkOverlay;
import mapwriter.api.IMwDataProvider;
import mapwriter.map.MapView;
import mapwriter.map.mapmode.MapMode;
import mcp.mobius.opis.data.ChunksData;
import mcp.mobius.opis.data.CoordinatesChunk;
import mcp.mobius.opis.data.TileEntityStatsData;
import mcp.mobius.opis.gui.interfaces.CType;
import mcp.mobius.opis.gui.interfaces.WAlign;
import mcp.mobius.opis.gui.widgets.LayoutBase;
import mcp.mobius.opis.gui.widgets.LayoutCanvas;
import mcp.mobius.opis.gui.widgets.ViewTable;
import mcp.mobius.opis.gui.widgets.WidgetGeometry;
import mcp.mobius.opis.network.Packet_ReqMeanTimeInDim;
import mcp.mobius.opis.network.Packet_ReqTEsInChunk;
import mcp.mobius.opis.network.Packet_UnregisterPlayer;
@@ -64,6 +73,19 @@ public class OverlayMeanTime implements IMwDataProvider {
}
CoordinatesChunk selectedChunk = null;
private static OverlayMeanTime _instance;
public boolean showList = false;
public LayoutCanvas canvas = null;
private OverlayMeanTime(){
}
public static OverlayMeanTime instance(){
if(_instance == null)
_instance = new OverlayMeanTime();
return _instance;
}
@Override
public ArrayList<IMwChunkOverlay> getChunksOverlay(int dim, double centerX, double centerZ, double minX, double minZ, double maxX, double maxZ) {
@@ -100,6 +122,8 @@ public class OverlayMeanTime implements IMwDataProvider {
@Override
public void onMiddleClick(int dim, int bX, int bZ, MapView mapview) {
this.showList = false;
int xChunk = bX >> 4;
int zChunk = bZ >> 4;
CoordinatesChunk clickedChunk = new CoordinatesChunk(dim, xChunk, zChunk);
@@ -140,13 +164,48 @@ public class OverlayMeanTime implements IMwDataProvider {
@Override
public void onOverlayDeactivated(MapView mapview) {
this.showList = false;
PacketDispatcher.sendPacketToServer(Packet_UnregisterPlayer.create());
}
@Override
public void onDraw(MapView mapview, MapMode mapmode) {
// TODO Auto-generated method stub
if (this.canvas == null)
this.canvas = new LayoutCanvas();
if (mapmode.marginLeft != 0){
this.canvas.hide();
return;
}
if (!this.showList)
this.canvas.hide();
else{
this.canvas.show();
this.canvas.draw();
}
}
@SideOnly(Side.CLIENT)
public void setupTable(ArrayList<TileEntityStatsData> entities){
LayoutBase layout = (LayoutBase)this.canvas.addWidget("Table", new LayoutBase(null));
layout.setGeometry(new WidgetGeometry(100.0,0.0,300.0,100.0,CType.RELXY, CType.REL_Y, WAlign.RIGHT, WAlign.TOP));
ViewTable table = (ViewTable)layout.addWidget("Table_", new ViewTable(null));
table.setGeometry(new WidgetGeometry(0.0,0.0,100.0,100.0,CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.TOP));
table.setColumnsAlign(WAlign.CENTER, WAlign.CENTER, WAlign.CENTER)
.setColumnsTitle("Type", "Pos", "Update Time")
.setColumnsWidth(50,25,25);
for (TileEntityStatsData data : entities){
String[] name = data.getType().split("\\.");
table.addRow(name[name.length - 1], String.format("[ %s %s %s ]", data.getCoordinates().x, data.getCoordinates().y, data.getCoordinates().z), String.format("%.5f ms",data.getGeometricMean()/1000.0));
}
this.showList = true;
}
}
+1 -1
View File
@@ -10,6 +10,6 @@ public class ProxyClient extends ProxyServer {
public void init(){
//MwAPI.registerDataProvider("Loaded chunks", OverlayLoadedChunks.instance);
MwAPI.registerDataProvider("Loaded chunks", new OverlayLoadedChunks());
MwAPI.registerDataProvider("Mean time", new OverlayMeanTime());
MwAPI.registerDataProvider("Mean time", OverlayMeanTime.instance());
}
}
-2
View File
@@ -3,8 +3,6 @@ package mcp.mobius.opis.proxy;
import java.util.HashMap;
import cpw.mods.fml.common.network.Player;
import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar;
import mcp.mobius.opis.data.ProfilerTileEntities;
import mcp.mobius.opis.overlay.OverlayStatus;
public class ProxyServer {
@@ -1,8 +1,6 @@
package mcp.mobius.opis.server;
import java.util.EnumSet;
import java.util.logging.Level;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.ChunksData;
import mcp.mobius.opis.data.TileEntitiesData;