mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-20 20:22:39 +00:00
Added ProfilerTileEntity based on ProfilerSection.
Made most of the timing data sent as a DataTiming. Fixed total timing errors.
This commit is contained in:
1 parent
853674f829
commit
3c93af6e1f
20 files changed
+228
-233
No files matched your search
@@ -10,7 +10,6 @@ import mcp.mobius.opis.data.managers.MetaManager;
|
||||
import mcp.mobius.opis.data.managers.TickHandlerManager;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.data.server.HandlerProfiler;
|
||||
import mcp.mobius.opis.data.server.TileEntityProfiler;
|
||||
import mcp.mobius.opis.events.OpisServerTickHandler;
|
||||
import mcp.mobius.opis.events.PlayerTracker;
|
||||
import mcp.mobius.opis.network.OpisPacketHandler;
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.util.ArrayList;
|
||||
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import mcp.mobius.opis.commands.IOpisCommand;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.events.PlayerTracker;
|
||||
@@ -43,17 +44,17 @@ public class CommandTimingTileEntities extends CommandBase implements IOpisComma
|
||||
return;
|
||||
}
|
||||
|
||||
ArrayList<StatsTileEntity> tes = new ArrayList<StatsTileEntity>();
|
||||
ArrayList<DataTileEntity> tes = new ArrayList<DataTileEntity>();
|
||||
if (astring.length == 0){
|
||||
tes = TileEntityManager.getTopEntities(20);
|
||||
tes = TileEntityManager.INSTANCE.getWorses(20);
|
||||
}
|
||||
else{
|
||||
try{
|
||||
tes = TileEntityManager.getTopEntities(Integer.valueOf(astring[0]));
|
||||
tes = TileEntityManager.INSTANCE.getWorses(Integer.valueOf(astring[0]));
|
||||
} catch (Exception e) {return;}
|
||||
}
|
||||
|
||||
for (StatsTileEntity stat : tes){
|
||||
for (DataTileEntity stat : tes){
|
||||
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(stat.toString()));
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
package mcp.mobius.opis.data.holders.newtypes;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate;
|
||||
|
||||
public class DataTileEntity implements ISerializable, Comparable {
|
||||
|
||||
public short id;
|
||||
public short meta;
|
||||
public CoordinatesBlock pos;
|
||||
public DataTiming update;
|
||||
|
||||
public DataTileEntity fill(CoordinatesBlock coord){
|
||||
this.pos = coord;
|
||||
World world = DimensionManager.getWorld(this.pos.dim);
|
||||
|
||||
this.id = (short) world.getBlockId(this.pos.x, this.pos.y, this.pos.z);
|
||||
this.meta = (short) world.getBlockMetadata(this.pos.x, this.pos.y, this.pos.z);
|
||||
|
||||
HashMap<CoordinatesBlock, DescriptiveStatistics> data = ((ProfilerTileEntityUpdate)(ProfilerSection.TILEENT_UPDATETIME.getProfiler())).data;
|
||||
this.update = new DataTiming(data.containsKey(this.pos) ? data.get(this.pos).getGeometricMean() : 0.0D);
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToStream(DataOutputStream stream) throws IOException {
|
||||
stream.writeShort(this.id);
|
||||
stream.writeShort(this.meta);
|
||||
this.pos.writeToStream(stream);
|
||||
this.update.writeToStream(stream);
|
||||
}
|
||||
|
||||
public static DataTileEntity readFromStream(DataInputStream stream) throws IOException {
|
||||
DataTileEntity retVal = new DataTileEntity();
|
||||
retVal.id = stream.readShort();
|
||||
retVal.meta = stream.readShort();
|
||||
retVal.pos = CoordinatesBlock.readFromStream(stream);
|
||||
retVal.update = DataTiming.readFromStream(stream);
|
||||
return retVal;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(Object o) {
|
||||
return this.update.compareTo(((DataTileEntity)o).update);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -12,16 +12,20 @@ import java.util.Set;
|
||||
import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection;
|
||||
import mcp.mobius.opis.api.IMessageHandler;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TicketData;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerEntityUpdate;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
import mcp.mobius.opis.network.packets.server.NetDataRaw;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.world.ChunkCoordIntPair;
|
||||
import net.minecraft.world.WorldServer;
|
||||
@@ -88,13 +92,17 @@ public enum ChunkManager implements IMessageHandler{
|
||||
public ArrayList<StatsChunk> getChunksUpdateTime(){
|
||||
HashMap<CoordinatesChunk, StatsChunk> chunks = new HashMap<CoordinatesChunk, StatsChunk>();
|
||||
|
||||
for (StatsTileEntity stat : TileEntityManager.stats.values()){
|
||||
if (!chunks.containsKey(stat.getChunk()))
|
||||
chunks.put(stat.getChunk(), new StatsChunk(stat.getChunk()));
|
||||
for (CoordinatesBlock coords : ((ProfilerTileEntityUpdate)ProfilerSection.TILEENT_UPDATETIME.getProfiler()).data.keySet()){
|
||||
DataTileEntity data = new DataTileEntity().fill(coords);
|
||||
CoordinatesChunk chunk = data.pos.asCoordinatesChunk();
|
||||
|
||||
chunks.get(stat.getChunk()).addTileEntity();
|
||||
chunks.get(stat.getChunk()).addMeasure(stat.getGeometricMean());
|
||||
}
|
||||
if (!chunks.containsKey(chunk))
|
||||
chunks.put(chunk, new StatsChunk(chunk));
|
||||
|
||||
chunks.get(chunk).addTileEntity();
|
||||
chunks.get(chunk).addMeasure(data.update.timing);
|
||||
|
||||
}
|
||||
|
||||
for (Entity entity : ((ProfilerEntityUpdate)ProfilerSection.ENTITY_UPDATETIME.getProfiler()).data.keySet()){
|
||||
DataEntity data = new DataEntity().fill(entity);
|
||||
|
||||
@@ -35,6 +35,7 @@ import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsPlayer;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerEntityUpdate;
|
||||
@@ -256,12 +257,12 @@ public enum EntityManager {
|
||||
return name;
|
||||
}
|
||||
|
||||
public double getTotalUpdateTime(){
|
||||
public DataTiming getTotalUpdateTime(){
|
||||
double updateTime = 0D;
|
||||
for (Entity entity : ((ProfilerEntityUpdate)ProfilerSection.ENTITY_UPDATETIME.getProfiler()).data.keySet()){
|
||||
updateTime = ((ProfilerEntityUpdate)ProfilerSection.ENTITY_UPDATETIME.getProfiler()).data.get(entity).getGeometricMean();
|
||||
updateTime += ((ProfilerEntityUpdate)ProfilerSection.ENTITY_UPDATETIME.getProfiler()).data.get(entity).getGeometricMean();
|
||||
}
|
||||
return updateTime;
|
||||
return new DataTiming(updateTime);
|
||||
}
|
||||
|
||||
public int killAll(String entName){
|
||||
|
||||
@@ -11,8 +11,6 @@ public class MetaManager {
|
||||
modOpis.profilerRun = false;
|
||||
modOpis.selectedBlock = null;
|
||||
OpisServerTickHandler.instance.profilerRunningTicks = 0;
|
||||
TileEntityManager.references.clear();
|
||||
TileEntityManager.stats.clear();
|
||||
TickHandlerManager.startStats.clear();
|
||||
TickHandlerManager.endStats.clear();
|
||||
ProfilerRegistrar.turnOff();
|
||||
|
||||
@@ -7,6 +7,7 @@ import java.util.HashMap;
|
||||
|
||||
import cpw.mods.fml.common.IScheduledTickHandler;
|
||||
import cpw.mods.fml.common.SingleIntervalHandler;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
|
||||
|
||||
public class TickHandlerManager {
|
||||
@@ -81,12 +82,12 @@ public class TickHandlerManager {
|
||||
return name;
|
||||
}
|
||||
|
||||
public static double getTotalUpdateTime(){
|
||||
public static DataTiming getTotalUpdateTime(){
|
||||
ArrayList<StatsTickHandler> tickCumul = getCumulatedStats();
|
||||
double updateTime = 0D;
|
||||
for (StatsTickHandler data : tickCumul){
|
||||
updateTime += data.getGeometricMean();
|
||||
}
|
||||
return updateTime;
|
||||
return new DataTiming(updateTime);
|
||||
}
|
||||
}
|
||||
@@ -6,11 +6,15 @@ import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
|
||||
import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsMod;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate;
|
||||
import mcp.mobius.opis.helpers.ModIdentification;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -21,49 +25,13 @@ import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
|
||||
public class TileEntityManager {
|
||||
public static HashMap<CoordinatesBlock, Class> references = new HashMap<CoordinatesBlock, Class>();
|
||||
public static HashMap<CoordinatesBlock, StatsTileEntity> stats = new HashMap<CoordinatesBlock, StatsTileEntity>();
|
||||
public enum TileEntityManager {
|
||||
INSTANCE;
|
||||
|
||||
public static void addTileEntity(TileEntity te, long timing){
|
||||
CoordinatesBlock coord = new CoordinatesBlock(te);
|
||||
|
||||
String teName;
|
||||
|
||||
/*
|
||||
try{
|
||||
teName = te.blockType.getLocalizedName();
|
||||
} catch (Exception e){
|
||||
System.out.printf("%s\n", e);
|
||||
teName = te.getClass().getName();
|
||||
}
|
||||
*/
|
||||
|
||||
teName = te.getClass().getName();
|
||||
|
||||
if (references.containsKey(coord) && references.get(coord) != te.getClass()){
|
||||
references.remove(coord);
|
||||
stats.remove(coord);
|
||||
}
|
||||
|
||||
if (!(references.containsKey(coord))){
|
||||
references.put(coord, te.getClass());
|
||||
|
||||
World world = DimensionManager.getWorld(coord.dim);
|
||||
int blockID = world.getBlockId(coord.x, coord.y, coord.z);
|
||||
short blockMeta = (short)world.getBlockMetadata(coord.x, coord.y, coord.z);
|
||||
stats.put(coord, new StatsTileEntity(coord, blockID, blockMeta));
|
||||
|
||||
//stats.put(coord, new TileEntityStats(coord, teName));
|
||||
}
|
||||
|
||||
stats.get(coord).addMeasure(timing);
|
||||
}
|
||||
|
||||
public static HashMap<CoordinatesChunk, StatsChunk> getTimes(int dim){
|
||||
public HashMap<CoordinatesChunk, StatsChunk> getTimes(int dim){
|
||||
HashMap<CoordinatesChunk, StatsChunk> chunks = new HashMap<CoordinatesChunk, StatsChunk>();
|
||||
|
||||
for (CoordinatesBlock coord : TileEntityManager.stats.keySet()){
|
||||
for (CoordinatesBlock coord : ((ProfilerTileEntityUpdate)ProfilerSection.TILEENT_UPDATETIME.getProfiler()).data.keySet()){
|
||||
if (coord.dim == dim){
|
||||
|
||||
CoordinatesChunk coordC = new CoordinatesChunk(coord);
|
||||
@@ -71,13 +39,15 @@ public class TileEntityManager {
|
||||
chunks.put(coordC, new StatsChunk());
|
||||
|
||||
chunks.get(coordC).addEntity();
|
||||
chunks.get(coordC).addMeasure(stats.get(coord).getGeometricMean());
|
||||
chunks.get(coordC).addMeasure(((ProfilerTileEntityUpdate)ProfilerSection.TILEENT_UPDATETIME.getProfiler()).data.get(coord).getGeometricMean());
|
||||
}
|
||||
}
|
||||
return chunks;
|
||||
}
|
||||
|
||||
private static void cleanUpStats(){
|
||||
private void cleanUpStats(){
|
||||
|
||||
/*
|
||||
HashSet<CoordinatesBlock> dirty = new HashSet<CoordinatesBlock>();
|
||||
|
||||
for (CoordinatesBlock tecoord : TileEntityManager.stats.keySet()){
|
||||
@@ -94,37 +64,19 @@ public class TileEntityManager {
|
||||
stats.remove(tecoord);
|
||||
references.remove(tecoord);
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
public static ArrayList<StatsTileEntity> getTileEntitiesInChunk(CoordinatesChunk coord){
|
||||
public ArrayList<DataTileEntity> getTileEntitiesInChunk(CoordinatesChunk coord){
|
||||
cleanUpStats();
|
||||
|
||||
ArrayList<StatsTileEntity> returnList = new ArrayList<StatsTileEntity>();
|
||||
ArrayList<DataTileEntity> returnList = new ArrayList<DataTileEntity>();
|
||||
|
||||
for (CoordinatesBlock tecoord : TileEntityManager.stats.keySet()){
|
||||
if (coord.equals(new CoordinatesChunk(tecoord))){
|
||||
StatsTileEntity testats = TileEntityManager.stats.get(tecoord);
|
||||
for (CoordinatesBlock tecoord : ((ProfilerTileEntityUpdate)ProfilerSection.TILEENT_UPDATETIME.getProfiler()).data.keySet()){
|
||||
if (coord.equals(tecoord.asCoordinatesChunk())){
|
||||
DataTileEntity testats = new DataTileEntity().fill(tecoord);
|
||||
|
||||
/*
|
||||
int x = testats.getCoordinates().x;
|
||||
int y = testats.getCoordinates().y;
|
||||
int z = testats.getCoordinates().z;
|
||||
|
||||
World world = DimensionManager.getWorld(tecoord.dim);
|
||||
Block mouseoverBlock = Block.blocksList[world.getBlockId(x, y, z)];
|
||||
|
||||
try{
|
||||
ItemStack stack = new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z));
|
||||
testats.setType(stack.getDisplayName());
|
||||
|
||||
}catch (Exception e){
|
||||
try{
|
||||
ItemStack stack = mouseoverBlock.getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0).get(0);
|
||||
testats.setType(stack.getDisplayName());
|
||||
}catch (Exception f){}
|
||||
}
|
||||
*/
|
||||
|
||||
returnList.add(testats);
|
||||
}
|
||||
}
|
||||
@@ -132,51 +84,31 @@ public class TileEntityManager {
|
||||
return returnList;
|
||||
}
|
||||
|
||||
public static ArrayList<StatsTileEntity> getTopEntities(int quantity){
|
||||
cleanUpStats();
|
||||
public ArrayList<DataTileEntity> getWorses(int amount){
|
||||
ArrayList<DataTileEntity> sorted = new ArrayList<DataTileEntity>();
|
||||
ArrayList<DataTileEntity> topEntities = new ArrayList<DataTileEntity>();
|
||||
|
||||
ArrayList<StatsTileEntity> sortedEntities = new ArrayList(TileEntityManager.stats.values());
|
||||
ArrayList<StatsTileEntity> topEntities = new ArrayList<StatsTileEntity>();
|
||||
Collections.sort(sortedEntities);
|
||||
for (CoordinatesBlock coord : ((ProfilerTileEntityUpdate)ProfilerSection.TILEENT_UPDATETIME.getProfiler()).data.keySet())
|
||||
sorted.add(new DataTileEntity().fill(coord));
|
||||
|
||||
Collections.sort(sorted);
|
||||
|
||||
for (int i = 0; i < Math.min(quantity, sortedEntities.size()); i++){
|
||||
StatsTileEntity testats = sortedEntities.get(i);
|
||||
topEntities.add(testats);
|
||||
}
|
||||
for (int i = 0; i < Math.min(amount, sorted.size()); i++)
|
||||
topEntities.add(sorted.get(i));
|
||||
|
||||
return topEntities;
|
||||
|
||||
return topEntities;
|
||||
}
|
||||
|
||||
public static double getTotalUpdateTime(){
|
||||
ArrayList<StatsTileEntity> entities = new ArrayList(TileEntityManager.stats.values());
|
||||
public DataTiming getTotalUpdateTime(){
|
||||
double updateTime = 0D;
|
||||
for (StatsTileEntity data : entities){
|
||||
updateTime += data.getGeometricMean();
|
||||
for (CoordinatesBlock coords : ((ProfilerTileEntityUpdate)ProfilerSection.TILEENT_UPDATETIME.getProfiler()).data.keySet()){
|
||||
updateTime += ((ProfilerTileEntityUpdate)ProfilerSection.TILEENT_UPDATETIME.getProfiler()).data.get(coords).getGeometricMean();
|
||||
}
|
||||
return updateTime;
|
||||
return new DataTiming(updateTime);
|
||||
}
|
||||
|
||||
public static ArrayList<StatsMod> getModStats(){
|
||||
cleanUpStats();
|
||||
HashMap<String, StatsMod> modStats = new HashMap<String, StatsMod>();
|
||||
|
||||
for (StatsTileEntity testat : TileEntityManager.stats.values()){
|
||||
String modID = ModIdentification.idFromStack(new ItemStack(testat.getID(), 1, testat.getMeta()));
|
||||
if (!modStats.containsKey(modID))
|
||||
modStats.put(modID, new StatsMod(modID));
|
||||
|
||||
modStats.get(modID).addStat(testat);
|
||||
}
|
||||
|
||||
ArrayList<StatsMod> outModStats = new ArrayList<StatsMod>(modStats.values());
|
||||
|
||||
//Collections.sort(outModStats);
|
||||
|
||||
return outModStats;
|
||||
}
|
||||
|
||||
public static int getAmountTileEntities(){
|
||||
public int getAmountTileEntities(){
|
||||
int amountTileEntities = 0;
|
||||
for (WorldServer world : DimensionManager.getWorlds()){
|
||||
amountTileEntities += world.loadedTileEntityList.size();
|
||||
|
||||
@@ -13,7 +13,7 @@ public class ProfilerTick extends ProfilerAbstract {
|
||||
|
||||
@Override
|
||||
public void reset() {
|
||||
this.data.clear();
|
||||
//this.data.clear();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
package mcp.mobius.opis.data.profilers;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.WeakHashMap;
|
||||
|
||||
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
|
||||
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
public class ProfilerTileEntityUpdate extends ProfilerAbstract {
|
||||
|
||||
private Clock clock = new Clock();
|
||||
public HashMap<CoordinatesBlock, DescriptiveStatistics> data = new HashMap<CoordinatesBlock, DescriptiveStatistics>();
|
||||
public HashMap<CoordinatesBlock, Class> refs = new HashMap<CoordinatesBlock, Class>();
|
||||
|
||||
@Override
|
||||
public void reset() {
|
||||
this.data.clear();
|
||||
this.refs.clear();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void start(Object key) {
|
||||
TileEntity tileent = (TileEntity)key;
|
||||
if (tileent.getWorldObj().isRemote) return;
|
||||
|
||||
CoordinatesBlock coord = new CoordinatesBlock(tileent);
|
||||
|
||||
if (!data.containsKey(coord) || (refs.get(coord) != tileent.getClass())){
|
||||
data.put(coord, new DescriptiveStatistics());
|
||||
refs.put(coord, tileent.getClass());
|
||||
}
|
||||
clock.start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stop(Object key) {
|
||||
TileEntity tileent = (TileEntity)key;
|
||||
if (tileent.getWorldObj().isRemote) return;
|
||||
|
||||
clock.stop();
|
||||
CoordinatesBlock coord = new CoordinatesBlock(tileent);
|
||||
|
||||
data.get(coord).addValue((double)clock.timeDelta);
|
||||
}
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
package mcp.mobius.opis.data.server;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import mcp.mobius.mobiuscore.profiler.IProfilerTileEntity;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
import mcp.mobius.opis.events.OpisServerTickHandler;
|
||||
|
||||
public class TileEntityProfiler extends AbstractProfiler implements IProfilerTileEntity {
|
||||
|
||||
private TileEntity currentEntity = null;
|
||||
|
||||
@Override
|
||||
public void FullTileEntityStart() { }
|
||||
|
||||
@Override
|
||||
public void FullTileEntityStop() { }
|
||||
|
||||
@Override
|
||||
public void Start(TileEntity te) {
|
||||
//if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return;
|
||||
if ((!modOpis.profilerRun) || (OpisServerTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0)) return;
|
||||
|
||||
if (te.worldObj.isRemote) return;
|
||||
|
||||
this.currentEntity = te;
|
||||
this.clock.start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void Stop(TileEntity te) {
|
||||
//if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return;
|
||||
if ((!modOpis.profilerRun) || (OpisServerTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0)) return;
|
||||
|
||||
this.clock.stop();
|
||||
if (te.worldObj.isRemote) return;
|
||||
|
||||
if (te != this.currentEntity)
|
||||
throw new RuntimeException(String.format("Mismatched entities during the profiling ! %s %s", te, this.currentEntity));
|
||||
|
||||
|
||||
TileEntityManager.addTileEntity(te, this.clock.timeDelta);
|
||||
this.currentEntity = null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -86,7 +86,7 @@ public class OpisServerTickHandler implements ITickHandler {
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.INSTANCE.getForcedChunkAmount())));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.INSTANCE.getLoadedChunkAmount())));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_TIMING_TICK, new DataTiming(((ProfilerTick)ProfilerSection.TICK.getProfiler()).data.getGeometricMean())));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.getAmountTileEntities())));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_TILEENTS, new SerialInt(TileEntityManager.INSTANCE.getAmountTileEntities())));
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_ENTITIES, new SerialInt(EntityManager.INSTANCE.getAmountEntities())));
|
||||
|
||||
OpisPacketHandler.sendPacketToAllSwing(NetDataList.create(Message.LIST_PLAYERS, EntityManager.INSTANCE.getAllPlayers()));
|
||||
|
||||
@@ -24,6 +24,7 @@ import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.gui.events.MouseEvent;
|
||||
@@ -280,13 +281,13 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
|
||||
|
||||
for (ISerializable uncasted : entities){
|
||||
|
||||
StatsTileEntity data = (StatsTileEntity)uncasted;
|
||||
DataTileEntity data = (DataTileEntity)uncasted;
|
||||
|
||||
ItemStack is;
|
||||
String name = String.format("te.%d.%d", data.getID(), data.getMeta());
|
||||
String name = String.format("te.%d.%d", data.id, data.meta);
|
||||
|
||||
try{
|
||||
is = new ItemStack(data.getID(), 1, data.getMeta());
|
||||
is = new ItemStack(data.id, 1, data.meta);
|
||||
name = is.getDisplayName();
|
||||
} catch (Exception e) { }
|
||||
|
||||
@@ -298,9 +299,9 @@ public class OverlayMeanTime implements IMwDataProvider, IMessageHandler{
|
||||
*/
|
||||
|
||||
if (modOpis.microseconds)
|
||||
table.addRow(data, name, String.format("[ %s %s %s ]", data.getCoordinates().x, data.getCoordinates().y, data.getCoordinates().z), String.format("%.5f \u00B5s",data.getGeometricMean()));
|
||||
table.addRow(data, name, String.format("[ %s %s %s ]", data.pos.x, data.pos.y, data.pos.z), data.update.asMillisecond().toString());
|
||||
else
|
||||
table.addRow(data, name, String.format("[ %s %s %s ]", data.getCoordinates().x, data.getCoordinates().y, data.getCoordinates().z), String.format("%.5f ms",data.getGeometricMean()/1000.0));
|
||||
table.addRow(data, name, String.format("[ %s %s %s ]", data.pos.x, data.pos.y, data.pos.z), data.update.toString());
|
||||
}
|
||||
|
||||
this.showList = true;
|
||||
|
||||
@@ -36,10 +36,10 @@ import mcp.mobius.opis.data.profilers.ProfilerDimBlockTick;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerDimTick;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerEntityUpdate;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerTick;
|
||||
import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate;
|
||||
import mcp.mobius.opis.data.server.DeadManSwitch;
|
||||
import mcp.mobius.opis.data.server.HandlerProfiler;
|
||||
import mcp.mobius.opis.data.server.NetworkProfiler;
|
||||
import mcp.mobius.opis.data.server.TileEntityProfiler;
|
||||
import mcp.mobius.opis.events.OpisClientEventHandler;
|
||||
import mcp.mobius.opis.events.OpisClientTickHandler;
|
||||
import mcp.mobius.opis.events.OpisServerEventHandler;
|
||||
@@ -134,7 +134,6 @@ public class modOpis {
|
||||
TickRegistry.registerTickHandler(new OpisServerTickHandler(), Side.SERVER);
|
||||
TickRegistry.registerTickHandler(new OpisClientTickHandler(), Side.CLIENT);
|
||||
|
||||
ProfilerRegistrar.registerProfilerTileEntity(new TileEntityProfiler());
|
||||
ProfilerRegistrar.registerProfilerHandler(new HandlerProfiler());
|
||||
ProfilerRegistrar.registerProfilerPacket(NetworkProfiler.INSTANCE);
|
||||
|
||||
@@ -147,7 +146,8 @@ public class modOpis {
|
||||
ProfilerSection.DIMENSION_TICK .setProfiler(new ProfilerDimTick());
|
||||
ProfilerSection.DIMENSION_BLOCKTICK.setProfiler(new ProfilerDimBlockTick());
|
||||
ProfilerSection.ENTITY_UPDATETIME .setProfiler(new ProfilerEntityUpdate());
|
||||
ProfilerSection.TICK .setProfiler(new ProfilerTick());
|
||||
ProfilerSection.TICK .setProfiler(new ProfilerTick());
|
||||
ProfilerSection.TILEENT_UPDATETIME .setProfiler(new ProfilerTileEntityUpdate());
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -23,6 +23,8 @@ 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.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
|
||||
@@ -200,11 +202,11 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
public static void sendFullUpdate(Player player){
|
||||
ArrayList<StatsTickHandler> timingHandlers = TickHandlerManager.getCumulatedStats();
|
||||
ArrayList<DataEntity> timingEntities = EntityManager.INSTANCE.getWorses(100);
|
||||
ArrayList<StatsTileEntity> timingTileEnts = TileEntityManager.getTopEntities(100);
|
||||
ArrayList<DataTileEntity> timingTileEnts = TileEntityManager.INSTANCE.getWorses(100);
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.INSTANCE.getTopChunks(100);
|
||||
SerialDouble totalTimeTE = new SerialDouble(TileEntityManager.getTotalUpdateTime());
|
||||
SerialDouble totalTimeEnt = new SerialDouble(EntityManager.INSTANCE.getTotalUpdateTime());
|
||||
SerialDouble totalTimeHandler = new SerialDouble(TickHandlerManager.getTotalUpdateTime());
|
||||
DataTiming totalTimeTE = TileEntityManager.INSTANCE.getTotalUpdateTime();
|
||||
DataTiming totalTimeEnt = EntityManager.INSTANCE.getTotalUpdateTime();
|
||||
DataTiming totalTimeHandler = TickHandlerManager.getTotalUpdateTime();
|
||||
|
||||
DataBlockTick totalWorldTick = new DataBlockTick().fill();
|
||||
|
||||
|
||||
@@ -26,6 +26,8 @@ import mcp.mobius.opis.data.holders.basetypes.SerialString;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockTick;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsEntity;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
|
||||
@@ -68,7 +70,7 @@ public class ServerMessageHandler {
|
||||
}
|
||||
|
||||
else if (maintype == Message.LIST_CHUNK_TILEENTS){
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_TILEENTS, TileEntityManager.getTileEntitiesInChunk((CoordinatesChunk)param1)), player);
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_CHUNK_TILEENTS, TileEntityManager.INSTANCE.getTileEntitiesInChunk((CoordinatesChunk)param1)), player);
|
||||
}
|
||||
|
||||
else if (maintype == Message.LIST_CHUNK_ENTITIES){
|
||||
@@ -87,24 +89,24 @@ public class ServerMessageHandler {
|
||||
}
|
||||
|
||||
else if (maintype == Message.LIST_TIMING_TILEENTS){
|
||||
ArrayList<StatsTileEntity> timingTileEnts = TileEntityManager.getTopEntities(100);
|
||||
SerialDouble totalTime = new SerialDouble(TileEntityManager.getTotalUpdateTime());
|
||||
ArrayList<DataTileEntity> timingTileEnts = TileEntityManager.INSTANCE.getWorses(100);
|
||||
DataTiming totalTime = TileEntityManager.INSTANCE.getTotalUpdateTime();
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create (Message.LIST_TIMING_TILEENTS, timingTileEnts), (Player)player);
|
||||
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_TILEENTS, totalTime), (Player)player);
|
||||
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_TILEENTS, totalTime), (Player)player);
|
||||
}
|
||||
|
||||
else if (maintype == Message.LIST_TIMING_ENTITIES){
|
||||
ArrayList<DataEntity> timingEntities = EntityManager.INSTANCE.getWorses(100);
|
||||
SerialDouble totalTime = new SerialDouble(EntityManager.INSTANCE.getTotalUpdateTime());
|
||||
DataTiming totalTime = EntityManager.INSTANCE.getTotalUpdateTime();
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_ENTITIES, timingEntities), (Player)player);
|
||||
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_ENTITIES, totalTime), (Player)player);
|
||||
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_ENTITIES, totalTime), (Player)player);
|
||||
}
|
||||
|
||||
else if (maintype == Message.LIST_TIMING_HANDLERS){
|
||||
ArrayList<StatsTickHandler> timingHandlers = TickHandlerManager.getCumulatedStats();
|
||||
SerialDouble totalTime = new SerialDouble(TickHandlerManager.getTotalUpdateTime());
|
||||
DataTiming totalTime = TickHandlerManager.getTotalUpdateTime();
|
||||
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_HANDLERS, timingHandlers), (Player)player);
|
||||
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_HANDLERS, totalTime), (Player)player);
|
||||
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_HANDLERS, totalTime), (Player)player);
|
||||
}
|
||||
|
||||
else if (maintype == Message.LIST_TIMING_CHUNK){
|
||||
|
||||
@@ -16,6 +16,7 @@ import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataBlockTick;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTimingMillisecond;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTick;
|
||||
@@ -101,10 +102,7 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{
|
||||
add(lblNewLabel_1, "cell 1 3");
|
||||
|
||||
lblTimingTileEnts = new JLabel("0");
|
||||
add(lblTimingTileEnts, "cell 3 3,alignx right");
|
||||
|
||||
JLabel lblNewLabel_12 = new JLabel("ms");
|
||||
add(lblNewLabel_12, "cell 4 3");
|
||||
add(lblTimingTileEnts, "cell 3 3 2 1,alignx right");
|
||||
|
||||
lblAmountTileEnts = new JLabel("0");
|
||||
add(lblAmountTileEnts, "cell 6 3,alignx right");
|
||||
@@ -125,10 +123,7 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{
|
||||
add(lblNewLabel_2, "cell 1 4");
|
||||
|
||||
lblTimingEntities = new JLabel("0");
|
||||
add(lblTimingEntities, "cell 3 4,alignx right");
|
||||
|
||||
JLabel lblNewLabel_11 = new JLabel("ms");
|
||||
add(lblNewLabel_11, "cell 4 4");
|
||||
add(lblTimingEntities, "cell 3 4 2 1,alignx right");
|
||||
|
||||
lblAmountEntities = new JLabel("0");
|
||||
add(lblAmountEntities, "cell 6 4,alignx right");
|
||||
@@ -137,10 +132,7 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{
|
||||
add(lblNewLabel_3, "cell 1 5");
|
||||
|
||||
lblTimingHandlers = new JLabel("0");
|
||||
add(lblTimingHandlers, "cell 3 5,alignx right");
|
||||
|
||||
JLabel lblNewLabel_10 = new JLabel("ms");
|
||||
add(lblNewLabel_10, "cell 4 5");
|
||||
add(lblTimingHandlers, "cell 3 5 2 1,alignx right");
|
||||
|
||||
lblAmountHandlers = new JLabel("0");
|
||||
add(lblAmountHandlers, "cell 6 5,alignx right");
|
||||
@@ -161,10 +153,7 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{
|
||||
add(lblNewLabel_4, "cell 1 7");
|
||||
|
||||
lblTimingTotal = new JLabel("0");
|
||||
add(lblTimingTotal, "cell 3 7,alignx right");
|
||||
|
||||
JLabel lblNewLabel_15 = new JLabel("ms");
|
||||
add(lblNewLabel_15, "cell 4 7");
|
||||
add(lblTimingTotal, "cell 3 7 2 1,alignx right");
|
||||
|
||||
JLabel lblNewLabel_31 = new JLabel("Tick Time");
|
||||
add(lblNewLabel_31, "cell 1 9");
|
||||
@@ -206,9 +195,9 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{
|
||||
}
|
||||
|
||||
private DataTimingMillisecond timingWorldTickTotal = new DataTimingMillisecond();
|
||||
private double timingHandlersTotal;
|
||||
private double timingTileEntsTotal;
|
||||
private double timingEntitiesTotal;
|
||||
private DataTimingMillisecond timingHandlersTotal = new DataTimingMillisecond();
|
||||
private DataTimingMillisecond timingTileEntsTotal = new DataTimingMillisecond();
|
||||
private DataTimingMillisecond timingEntitiesTotal = new DataTimingMillisecond();
|
||||
|
||||
public void setTimingEntUpdateTotal(double value){
|
||||
}
|
||||
@@ -258,8 +247,8 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{
|
||||
((NumberAxis)xyPlot.getDomainAxis()).setRange(0.0, 100.0);
|
||||
}
|
||||
|
||||
private double getProfiledTickTotalTime(){
|
||||
return (timingWorldTickTotal.timing + (timingHandlersTotal + timingTileEntsTotal + timingEntitiesTotal)/1000.);
|
||||
private DataTimingMillisecond getProfiledTickTotalTime(){
|
||||
return new DataTimingMillisecond(timingWorldTickTotal.timing + timingTileEntsTotal.timing + timingEntitiesTotal.timing + timingHandlersTotal.timing);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -300,27 +289,27 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{
|
||||
break;
|
||||
}
|
||||
case VALUE_TIMING_TILEENTS:{
|
||||
this.timingTileEntsTotal = ((SerialDouble)rawdata.value).value;
|
||||
this.getLblTimingTileEnts().setText(String.format("%.3f", this.timingTileEntsTotal/1000.));
|
||||
this.getLblTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() ));
|
||||
this.timingTileEntsTotal = ((DataTiming)rawdata.value).asMillisecond();
|
||||
this.getLblTimingTileEnts().setText(this.timingTileEntsTotal.toString());
|
||||
this.getLblTimingTotal().setText(String.format("%s", this.getProfiledTickTotalTime().toString() ));
|
||||
break;
|
||||
}
|
||||
case VALUE_TIMING_ENTITIES:{
|
||||
this.timingEntitiesTotal = ((SerialDouble)rawdata.value).value;
|
||||
this.getLblTimingEntities().setText(String.format("%.3f", this.timingEntitiesTotal/1000.));
|
||||
this.getLblTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() ));
|
||||
this.timingEntitiesTotal = ((DataTiming)rawdata.value).asMillisecond();
|
||||
this.getLblTimingEntities().setText(this.timingEntitiesTotal.toString());
|
||||
this.getLblTimingTotal().setText(String.format("%s", this.getProfiledTickTotalTime().toString() ));
|
||||
break;
|
||||
}
|
||||
case VALUE_TIMING_HANDLERS:{
|
||||
this.timingHandlersTotal = ((SerialDouble)rawdata.value).value;
|
||||
this.getLblTimingHandlers().setText(String.format("%.3f", this.timingHandlersTotal/1000.));
|
||||
this.getLblTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() ));
|
||||
this.timingHandlersTotal = ((DataTiming)rawdata.value).asMillisecond();
|
||||
this.getLblTimingHandlers().setText(this.timingHandlersTotal.toString());
|
||||
this.getLblTimingTotal().setText(String.format("%s", this.getProfiledTickTotalTime().toString() ));
|
||||
break;
|
||||
}
|
||||
case VALUE_TIMING_WORLDTICK:{
|
||||
this.timingWorldTickTotal = ((DataBlockTick)rawdata.value).total.asMillisecond();
|
||||
this.getLblTimingWorldTick().setText(this.timingWorldTickTotal.toString());
|
||||
this.getLblTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() ));
|
||||
this.getLblTimingTotal().setText(String.format("%s", this.getProfiledTickTotalTime().toString() ));
|
||||
break;
|
||||
}
|
||||
case STATUS_START:{
|
||||
|
||||
@@ -126,7 +126,7 @@ public class PanelTimingEntities extends JPanelMsgHandler implements ITabPanel{
|
||||
break;
|
||||
}
|
||||
case VALUE_TIMING_ENTITIES:{
|
||||
this.getLblSummary().setText(String.format("Total update time : %.3f µs", ((SerialDouble)rawdata.value).value));
|
||||
this.getLblSummary().setText(String.format("Total update time : %s", ((DataTiming)rawdata.value).toString()));
|
||||
break;
|
||||
}
|
||||
case STATUS_START:{
|
||||
|
||||
@@ -5,6 +5,7 @@ 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.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatAbstract;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
|
||||
import mcp.mobius.opis.network.enums.AccessLevel;
|
||||
@@ -103,7 +104,7 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{
|
||||
break;
|
||||
}
|
||||
case VALUE_TIMING_HANDLERS:{
|
||||
this.getLblSummary().setText(String.format("Total update time : %.3f µs", ((SerialDouble)rawdata.value).value));
|
||||
this.getLblSummary().setText(String.format("Total update time : %s", ((DataTiming)rawdata.value).toString()));
|
||||
break;
|
||||
}
|
||||
case STATUS_START:{
|
||||
|
||||
@@ -7,6 +7,8 @@ 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.newtypes.DataTileEntity;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
|
||||
import mcp.mobius.opis.data.holders.stats.StatAbstract;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
|
||||
import mcp.mobius.opis.gui.overlay.OverlayMeanTime;
|
||||
@@ -74,7 +76,7 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{
|
||||
}
|
||||
) {
|
||||
Class[] columnTypes = new Class[] {
|
||||
String.class, String.class, Integer.class, Object.class, StatAbstract.class
|
||||
String.class, String.class, Integer.class, Object.class, DataTiming.class
|
||||
};
|
||||
boolean[] columnEditables = new boolean[] {
|
||||
false, false, false, false, false
|
||||
@@ -112,16 +114,16 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{
|
||||
((JTableStats)this.getTable()).setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = (DefaultTableModel)table.getModel();
|
||||
int row = this.updateData(table, model, StatsTileEntity.class);
|
||||
int row = this.updateData(table, model, DataTileEntity.class);
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
StatsTileEntity stat = (StatsTileEntity)o;
|
||||
DataTileEntity data = (DataTileEntity)o;
|
||||
ItemStack is;
|
||||
String name = String.format("te.%d.%d", stat.getID(), stat.getMeta());
|
||||
String name = String.format("te.%d.%d", data.id, data.meta);
|
||||
String modID = "<UNKNOWN>";
|
||||
|
||||
try{
|
||||
is = new ItemStack(stat.getID(), 1, stat.getMeta());
|
||||
is = new ItemStack(data.id, 1, data.meta);
|
||||
name = is.getDisplayName();
|
||||
modID = ModIdentification.idFromStack(is);
|
||||
} catch (Exception e) { }
|
||||
@@ -129,9 +131,9 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{
|
||||
model.addRow(new Object[] {
|
||||
name,
|
||||
modID,
|
||||
stat.getCoordinates().dim,
|
||||
String.format("[ %4d %4d %4d ]", stat.getCoordinates().x, stat.getCoordinates().y, stat.getCoordinates().z),
|
||||
stat});
|
||||
data.pos.dim,
|
||||
String.format("[ %4d %4d %4d ]", data.pos.x, data.pos.y, data.pos.z),
|
||||
data.update});
|
||||
}
|
||||
|
||||
this.dataUpdated(table, model, row);
|
||||
@@ -139,7 +141,7 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{
|
||||
break;
|
||||
}
|
||||
case VALUE_TIMING_TILEENTS:{
|
||||
this.getLblSummary().setText(String.format("Total update time : %.3f µs", ((SerialDouble)rawdata.value).value));
|
||||
this.getLblSummary().setText(String.format("Total update time : %s", ((DataTiming)rawdata.value).toString()));
|
||||
break;
|
||||
}
|
||||
case STATUS_START:{
|
||||
|
||||
Reference in new issue
Block a user