Refactoring

This commit is contained in:
ProfMobius committed 2014-03-20 15:19:23 +01:00
1 parent cf2ef06862
commit 80441057e3
48 files changed
+290 -270

No files matched your search

@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import mcp.mobius.opis.commands.IOpisCommand;
import mcp.mobius.opis.data.holders.AmountHolder;
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
import mcp.mobius.opis.data.managers.EntityManager;
import mcp.mobius.opis.network.enums.DataReq;
import mcp.mobius.opis.network.server.Packet_DataList;
@@ -3,7 +3,7 @@ package mcp.mobius.opis.commands.server;
import java.util.ArrayList;
import mcp.mobius.opis.commands.IOpisCommand;
import mcp.mobius.opis.data.holders.ChunkStats;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.data.managers.ChunkManager;
import mcp.mobius.opis.network.enums.DataReq;
import mcp.mobius.opis.network.server.Packet_DataList;
@@ -35,7 +35,7 @@ public class CommandChunkList extends CommandBase implements IOpisCommand {
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
ArrayList<ChunkStats> chunks = new ArrayList<ChunkStats>();
ArrayList<StatsChunk> chunks = new ArrayList<StatsChunk>();
if (astring.length == 0)
chunks = ChunkManager.getTopChunks(100);
@@ -54,7 +54,7 @@ public class CommandChunkList extends CommandBase implements IOpisCommand {
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.TIMING, DataReq.CHUNK, chunks));
else {
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText("[DIM X Z] Time NTEs"));
for (ChunkStats stat : chunks){
for (StatsChunk stat : chunks){
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(stat.toString()));
}
}
@@ -10,8 +10,8 @@ import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.commands.IOpisCommand;
import mcp.mobius.opis.data.holders.ModStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.stats.StatsMod;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
import mcp.mobius.opis.data.managers.TileEntityManager;
import mcp.mobius.opis.tools.ModIdentification;
import net.minecraft.command.CommandBase;
@@ -43,13 +43,13 @@ public class CommandDataDump extends CommandBase implements IOpisCommand {
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
ArrayList<ModStats> modStats = TileEntityManager.getModStats();
ArrayList<StatsMod> modStats = TileEntityManager.getModStats();
try {
BufferedWriter out = new BufferedWriter(new FileWriter("mods.csv"));
out.write(String.format("modid,ntes,mean,geommean,variance,min,max,sum,median\n"));
for (ModStats stat: modStats)
for (StatsMod stat: modStats)
out.write(String.format("%s,%d,%f,%f,%f,%f,%f,%f,%f\n", stat.getModID(),
stat.dstat.getN(),
stat.dstat.getMean(),
@@ -77,13 +77,13 @@ public class CommandDataDump extends CommandBase implements IOpisCommand {
}
int nentities = TileEntityManager.stats.size();
ArrayList<TileEntityStats> entStats = TileEntityManager.getTopEntities(nentities);
ArrayList<StatsTileEntity> entStats = TileEntityManager.getTopEntities(nentities);
try {
BufferedWriter out = new BufferedWriter(new FileWriter("tileentities.csv"));
out.write(String.format("name,mod,dim,x,y,z,chunkX,chunkZ,npoints,mean,geommean,variance,min,max,sum,median\n"));
for (TileEntityStats stat: entStats){
for (StatsTileEntity stat: entStats){
ItemStack is;
String name = String.format("te.%d.%d", stat.getID(), stat.getMeta());
@@ -5,7 +5,7 @@ import java.util.Collections;
import java.util.HashMap;
import mcp.mobius.opis.commands.IOpisCommand;
import mcp.mobius.opis.data.holders.TickHandlerStats;
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
import mcp.mobius.opis.data.managers.TickHandlerManager;
import mcp.mobius.opis.network.enums.DataReq;
import mcp.mobius.opis.network.server.Packet_DataList;
@@ -36,13 +36,13 @@ public class CommandHandler extends CommandBase implements IOpisCommand {
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
ArrayList<TickHandlerStats> stats = TickHandlerManager.getCumulatedStats();
ArrayList<StatsTickHandler> stats = TickHandlerManager.getCumulatedStats();
//((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataScreenTimingHandlers.create(stats));
if (icommandsender instanceof EntityPlayerMP)
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.TIMING, DataReq.HANDLERS, stats));
else{
for (TickHandlerStats s : stats)
for (StatsTickHandler s : stats)
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("%s : %.2f", s.getName(), s.getGeometricMean())));
}
@@ -3,7 +3,7 @@ package mcp.mobius.opis.commands.server;
import java.util.ArrayList;
import mcp.mobius.opis.commands.IOpisCommand;
import mcp.mobius.opis.data.holders.ModStats;
import mcp.mobius.opis.data.holders.stats.StatsMod;
import mcp.mobius.opis.data.managers.TileEntityManager;
import mcp.mobius.opis.network.server.Packet_ModMeanTime;
import net.minecraft.command.CommandBase;
@@ -34,13 +34,13 @@ public class CommandMeanModTime extends CommandBase implements IOpisCommand {
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
ArrayList<ModStats> modStats = TileEntityManager.getModStats();
ArrayList<StatsMod> modStats = TileEntityManager.getModStats();
if (icommandsender instanceof EntityPlayer)
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_ModMeanTime.create(modStats));
else{
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText("[Name] NTEs MeanTime"));
for (ModStats stat : modStats){
for (StatsMod stat : modStats){
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(
String.format("[ %s ] %3d %.2f", stat.getModID(), stat.ntes, stat.dstat.getMean())));
}
@@ -4,8 +4,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import mcp.mobius.opis.commands.IOpisCommand;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.data.managers.EntityManager;
import mcp.mobius.opis.network.enums.DataReq;
import mcp.mobius.opis.network.server.Packet_DataList;
@@ -37,7 +37,7 @@ public class CommandTimingEntities extends CommandBase implements IOpisCommand {
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
ArrayList<EntityStats> ents = new ArrayList<EntityStats>();
ArrayList<StatsEntity> ents = new ArrayList<StatsEntity>();
if (astring.length == 0){
ents = EntityManager.getTopEntities(100);
}
@@ -51,7 +51,7 @@ public class CommandTimingEntities extends CommandBase implements IOpisCommand {
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.TIMING, DataReq.ENTITIES, ents));
else{
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText("[DIM X Z] Time NTEs"));
for (EntityStats stat : ents){
for (StatsEntity stat : ents){
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(stat.toString()));
}
}
@@ -3,7 +3,7 @@ package mcp.mobius.opis.commands.server;
import java.util.ArrayList;
import mcp.mobius.opis.commands.IOpisCommand;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
import mcp.mobius.opis.data.managers.TileEntityManager;
import mcp.mobius.opis.network.enums.DataReq;
import mcp.mobius.opis.network.server.Packet_DataList;
@@ -35,7 +35,7 @@ public class CommandTimingTileEntities extends CommandBase implements IOpisComma
@Override
public void processCommand(ICommandSender icommandsender, String[] astring) {
ArrayList<TileEntityStats> tes = new ArrayList<TileEntityStats>();
ArrayList<StatsTileEntity> tes = new ArrayList<StatsTileEntity>();
if (astring.length == 0){
tes = TileEntityManager.getTopEntities(20);
}
@@ -48,7 +48,7 @@ public class CommandTimingTileEntities extends CommandBase implements IOpisComma
if (icommandsender instanceof EntityPlayer)
((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.TIMING, DataReq.TILETENTS, tes));
else{
for (TileEntityStats stat : tes){
for (StatsTileEntity stat : tes){
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(stat.toString()));
}
}
+25 -25
View File
@@ -25,14 +25,14 @@ import org.jfree.data.xy.XYSeriesCollection;
import codechicken.lib.math.MathHelper;
import net.minecraft.item.ItemStack;
import mcp.mobius.opis.data.holders.AmountHolder;
import mcp.mobius.opis.data.holders.ChunkStats;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.StatAbstract;
import mcp.mobius.opis.data.holders.TickHandlerStats;
import mcp.mobius.opis.data.holders.TickStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.data.holders.stats.StatsTick;
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
import mcp.mobius.opis.gui.swing.SwingUI;
import mcp.mobius.opis.tools.ModIdentification;
@@ -42,10 +42,10 @@ public class DataCache {
public static DataCache instance() { return _instance; };
private ArrayList<AmountHolder> amountEntities = new ArrayList<AmountHolder>();
private ArrayList<TickHandlerStats> timingHandlers = new ArrayList<TickHandlerStats>();
private ArrayList<EntityStats> timingEntities = new ArrayList<EntityStats>();
private ArrayList<TileEntityStats> timingTileEnts = new ArrayList<TileEntityStats>();
private ArrayList<ChunkStats> timingChunks = new ArrayList<ChunkStats>();
private ArrayList<StatsTickHandler> timingHandlers = new ArrayList<StatsTickHandler>();
private ArrayList<StatsEntity> timingEntities = new ArrayList<StatsEntity>();
private ArrayList<StatsTileEntity> timingTileEnts = new ArrayList<StatsTileEntity>();
private ArrayList<StatsChunk> timingChunks = new ArrayList<StatsChunk>();
private double timingHandlersTotal = 0D;
private double timingEntitiesTotal = 0D;
@@ -56,7 +56,7 @@ public class DataCache {
private int amountEntitiesTotal = 0;
private int amountTileEntsTotal = 0;
private TickStats timingTick = new TickStats();
private StatsTick timingTick = new StatsTick();
private ArrayList<Double> timingTickGraphData = new ArrayList<Double>();
//private DescriptiveStatistics timingTickGraphData = new DescriptiveStatistics(100);
@@ -103,7 +103,7 @@ public class DataCache {
}
public void setTimingTick(ISerializable tickStat){
this.timingTick = (TickStats)tickStat;
this.timingTick = (StatsTick)tickStat;
SwingUI.instance().getLblSummaryTimingTick().setText(String.valueOf(String.format("%.3f", this.timingTick.getGeometricMean()/1000.)));
if (timingTickGraphData.size() > 100)
@@ -148,19 +148,19 @@ public class DataCache {
return this.amountEntities;
}
public ArrayList<TickHandlerStats> getTimingHandlers(){
public ArrayList<StatsTickHandler> getTimingHandlers(){
return this.timingHandlers;
}
public ArrayList<EntityStats> getTimingEntities(){
public ArrayList<StatsEntity> getTimingEntities(){
return this.timingEntities;
}
public ArrayList<TileEntityStats> getTimingTileEnts(){
public ArrayList<StatsTileEntity> getTimingTileEnts(){
return this.timingTileEnts;
}
public ArrayList<ChunkStats> getTimingChunks(){
public ArrayList<StatsChunk> getTimingChunks(){
return this.timingChunks;
}
@@ -186,12 +186,12 @@ public class DataCache {
public void setTimingHandlers(ArrayList<ISerializable> timingHandlers_){
this.timingHandlers.clear();
for (ISerializable stat : timingHandlers_)
this.timingHandlers.add((TickHandlerStats)stat);
this.timingHandlers.add((StatsTickHandler)stat);
DefaultTableModel model = (DefaultTableModel)SwingUI.instance().getTableTimingHandler().getModel();
this.clearRows(model);
for (TickHandlerStats stat : DataCache.instance().getTimingHandlers()){
for (StatsTickHandler stat : DataCache.instance().getTimingHandlers()){
model.addRow(new Object[] {stat.getName(), String.format("%.3f \u00B5s", stat.getGeometricMean())});
}
@@ -201,12 +201,12 @@ public class DataCache {
public void setTimingEntities(ArrayList<ISerializable> timingEntities_){
this.timingEntities.clear();
for (ISerializable stat : timingEntities_)
this.timingEntities.add((EntityStats)stat);
this.timingEntities.add((StatsEntity)stat);
DefaultTableModel model = (DefaultTableModel)SwingUI.instance().getTableTimingEnt().getModel();
this.clearRows(model);
for (EntityStats stat : DataCache.instance().getTimingEntities()){
for (StatsEntity stat : DataCache.instance().getTimingEntities()){
model.addRow(new Object[] {stat.getName(),
stat.getID(),
stat.getCoordinates().dim,
@@ -222,12 +222,12 @@ public class DataCache {
public void setTimingTileEnts(ArrayList<ISerializable> timingTileEnts_){
this.timingTileEnts.clear();
for (ISerializable stat : timingTileEnts_)
this.timingTileEnts.add((TileEntityStats)stat);
this.timingTileEnts.add((StatsTileEntity)stat);
DefaultTableModel model = (DefaultTableModel)SwingUI.instance().getTableTimingTE().getModel();
this.clearRows(model);
for (TileEntityStats stat : DataCache.instance().getTimingTileEnts()){
for (StatsTileEntity stat : DataCache.instance().getTimingTileEnts()){
ItemStack is;
String name = String.format("te.%d.%d", stat.getID(), stat.getMeta());
String modID = "<UNKNOWN>";
@@ -252,12 +252,12 @@ public class DataCache {
public void setTimingChunks(ArrayList<ISerializable> timingChunks_){
this.timingChunks.clear();
for (ISerializable stat : timingChunks_)
this.timingChunks.add((ChunkStats)stat);
this.timingChunks.add((StatsChunk)stat);
DefaultTableModel model = (DefaultTableModel)SwingUI.instance().getTableTimingChunk().getModel();
this.clearRows(model);
for (ChunkStats stat : DataCache.instance().getTimingChunks()){
for (StatsChunk stat : DataCache.instance().getTimingChunks()){
model.addRow(new Object[] {
stat.getChunk().dim,
String.format("[ %4d %4d ]", stat.getChunk().x, stat.getChunk().z),
@@ -1,9 +1,10 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.basetypes;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import mcp.mobius.opis.data.holders.ISerializable;
import net.minecraft.network.packet.Packet;
public class AmountHolder implements ISerializable {
@@ -1,9 +1,10 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.basetypes;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import mcp.mobius.opis.data.holders.ISerializable;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
@@ -1,9 +1,10 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.basetypes;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import mcp.mobius.opis.data.holders.ISerializable;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.ChunkCoordIntPair;
@@ -1,9 +1,11 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.basetypes;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import mcp.mobius.opis.data.holders.ISerializable;
public class TargetEntity implements ISerializable {
public int entityID = 0;
@@ -1,4 +1,4 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.basetypes;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -7,6 +7,7 @@ import java.util.LinkedHashSet;
import com.google.common.collect.ImmutableSet;
import mcp.mobius.opis.data.holders.ISerializable;
import net.minecraft.network.packet.Packet;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraftforge.common.ForgeChunkManager.Ticket;
@@ -1,8 +1,12 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.stats;
import java.io.DataOutputStream;
import java.io.IOException;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
public abstract class StatAbstract implements Comparable, ISerializable{
@@ -1,26 +1,28 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.stats;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
public class ChunkStats extends StatAbstract{
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
public class StatsChunk extends StatAbstract{
public int tileEntities = 0;
public int entities = 0;
public ChunkStats(){}
public StatsChunk(){}
public ChunkStats(CoordinatesChunk chunk){
public StatsChunk(CoordinatesChunk chunk){
this.chunk = chunk;
}
public ChunkStats(CoordinatesChunk chunk, int tileEntities, int entities){
public StatsChunk(CoordinatesChunk chunk, int tileEntities, int entities){
this.chunk = chunk;
this.tileEntities = tileEntities;
this.entities = entities;
}
public ChunkStats(CoordinatesChunk chunk, int tileEntities, int entities, double time){
public StatsChunk(CoordinatesChunk chunk, int tileEntities, int entities, double time){
this.chunk = chunk;
this.tileEntities = tileEntities;
this.entities = entities;
@@ -48,9 +50,9 @@ public class ChunkStats extends StatAbstract{
stream.writeDouble(this.getDataSum());
}
public static ChunkStats readFromStream(DataInputStream stream) throws IOException {
public static StatsChunk readFromStream(DataInputStream stream) throws IOException {
CoordinatesChunk chunk = CoordinatesChunk.readFromStream(stream);
ChunkStats chunkStats = new ChunkStats(chunk, stream.readInt(), stream.readInt());
StatsChunk chunkStats = new StatsChunk(chunk, stream.readInt(), stream.readInt());
chunkStats.setDataSum(stream.readDouble());
return chunkStats;
}
@@ -1,4 +1,4 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.stats;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -9,15 +9,17 @@ import net.minecraft.network.packet.Packet;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
public class EntityStats extends StatAbstract implements ISerializable {
public class StatsEntity extends StatAbstract implements ISerializable {
private int entId;
private int dim;
private double cachedMedian = -1.0;
private double x, y, z;
public EntityStats(int entId, String name, int dim, double x, double y, double z){
public StatsEntity(int entId, String name, int dim, double x, double y, double z){
this.entId = entId;
this.name = name;
this.dim = dim;
@@ -66,8 +68,8 @@ public class EntityStats extends StatAbstract implements ISerializable {
stream.writeLong(this.getDataPoints());
}
public static EntityStats readFromStream(DataInputStream stream) throws IOException {
EntityStats stats = new EntityStats(stream.readInt(), Packet.readString(stream, 255), stream.readInt(),
public static StatsEntity readFromStream(DataInputStream stream) throws IOException {
StatsEntity stats = new StatsEntity(stream.readInt(), Packet.readString(stream, 255), stream.readInt(),
stream.readDouble(), stream.readDouble(), stream.readDouble());
stats.setGeometricMean(stream.readDouble());
stats.setDataPoints(stream.readLong());
@@ -1,4 +1,4 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.stats;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -6,9 +6,10 @@ import java.io.IOException;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import mcp.mobius.opis.data.holders.ISerializable;
import net.minecraft.network.packet.Packet;
public class ModStats implements ISerializable, Comparable{
public class StatsMod implements ISerializable, Comparable{
private String modID;
public double meanTime;
public double meanGeom;
@@ -23,14 +24,14 @@ public class ModStats implements ISerializable, Comparable{
public DescriptiveStatistics dstat = new DescriptiveStatistics();
public ModStats(String modID){
public StatsMod(String modID){
this.modID = modID;
if (this.modID == null)
this.modID = "<Unknown>";
}
public void addStat(TileEntityStats tes){
public void addStat(StatsTileEntity tes){
this.dstat.addValue(tes.getGeometricMean());
}
@@ -61,7 +62,7 @@ public class ModStats implements ISerializable, Comparable{
public int compareTo(Object o) {
//return this.dstat.getMean() > ((ModStats)o).dstat.getMean() ? -1 : 1;
//return this.meanTime > ((ModStats)o).meanTime ? -1 : 1;
return this.getMedian() > ((ModStats)o).getMedian() ? -1 : 1;
return this.getMedian() > ((StatsMod)o).getMedian() ? -1 : 1;
}
@Override
@@ -78,9 +79,9 @@ public class ModStats implements ISerializable, Comparable{
stream.writeInt((int)dstat.getN());
}
public static ModStats readFromStream(DataInputStream stream) throws IOException {
public static StatsMod readFromStream(DataInputStream stream) throws IOException {
String modID = Packet.readString(stream, 255);
ModStats modStats = new ModStats(modID);
StatsMod modStats = new StatsMod(modID);
modStats.meanTime = stream.readDouble();
modStats.meanGeom = stream.readDouble();
@@ -1,4 +1,4 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.stats;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -6,7 +6,7 @@ import java.io.IOException;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
public class TickStats extends StatAbstract {
public class StatsTick extends StatAbstract {
public DescriptiveStatistics dstat = new DescriptiveStatistics(20);
@@ -15,8 +15,8 @@ public class TickStats extends StatAbstract {
stream.writeDouble(this.getGeometricMean());
}
public static TickStats readFromStream(DataInputStream stream) throws IOException {
TickStats stat = new TickStats();
public static StatsTick readFromStream(DataInputStream stream) throws IOException {
StatsTick stat = new StatsTick();
stat.setGeometricMean(stream.readDouble());
return stat;
}
@@ -1,16 +1,17 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.stats;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import mcp.mobius.opis.data.holders.ISerializable;
import net.minecraft.network.packet.Packet;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
public class TickHandlerStats extends StatAbstract implements ISerializable{
public class StatsTickHandler extends StatAbstract implements ISerializable{
public TickHandlerStats(String name){
public StatsTickHandler(String name){
this.name = name;
}
@@ -24,8 +25,8 @@ public class TickHandlerStats extends StatAbstract implements ISerializable{
stream.writeDouble(this.getGeometricMean());
}
public static TickHandlerStats readFromStream(DataInputStream stream) throws IOException {
TickHandlerStats stats = new TickHandlerStats(Packet.readString(stream, 255));
public static StatsTickHandler readFromStream(DataInputStream stream) throws IOException {
StatsTickHandler stats = new StatsTickHandler(Packet.readString(stream, 255));
stats.setGeometricMean(stream.readDouble());
return stats;
}
@@ -1,22 +1,24 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.stats;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import net.minecraft.network.packet.Packet;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
public class TileEntityStats extends StatAbstract implements ISerializable {
public class StatsTileEntity extends StatAbstract implements ISerializable {
private int blockID;
private short blockMeta;
private double cachedMedian = -1.0;
public TileEntityStats(CoordinatesBlock coord, int blockID, short blockMeta){
public StatsTileEntity(CoordinatesBlock coord, int blockID, short blockMeta){
this.coord = coord;
//this.name = teclass;
this.blockID = blockID;
@@ -60,12 +62,12 @@ public class TileEntityStats extends StatAbstract implements ISerializable {
stream.writeDouble(this.getGeometricMean());
}
public static TileEntityStats readFromStream(DataInputStream stream) throws IOException {
public static StatsTileEntity readFromStream(DataInputStream stream) throws IOException {
CoordinatesBlock coord = CoordinatesBlock.readFromStream(stream);
int blockID = stream.readInt();
short blockMeta = stream.readShort();
//String classname = Packet.readString(stream, 255);
TileEntityStats stat = new TileEntityStats(coord, blockID, blockMeta);
StatsTileEntity stat = new StatsTileEntity(coord, blockID, blockMeta);
stat.setGeometricMean(stream.readDouble());
return stat;
}
@@ -1,18 +1,20 @@
package mcp.mobius.opis.data.holders;
package mcp.mobius.opis.data.holders.stats;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
public class WorldTickStats extends StatAbstract implements ISerializable {
import mcp.mobius.opis.data.holders.ISerializable;
public class StatsWorldTick extends StatAbstract implements ISerializable {
@Override
public void writeToStream(DataOutputStream stream) throws IOException {
stream.writeDouble(this.getGeometricMean());
}
public static TickStats readFromStream(DataInputStream stream) throws IOException {
TickStats stat = new TickStats();
public static StatsTick readFromStream(DataInputStream stream) throws IOException {
StatsTick stat = new StatsTick();
stat.setGeometricMean(stream.readDouble());
return stat;
}
+16 -16
View File
@@ -8,11 +8,11 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import mcp.mobius.opis.data.holders.ChunkStats;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.TicketData;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
import mcp.mobius.opis.data.holders.basetypes.TicketData;
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 net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.WorldServer;
import net.minecraftforge.common.DimensionManager;
@@ -23,7 +23,7 @@ public class ChunkManager {
public static HashMap<ChunkCoordIntPair, Boolean> chunksLoad = new HashMap<ChunkCoordIntPair, Boolean>();
public static HashMap<CoordinatesChunk, ChunkStats> chunkMeanTime = new HashMap<CoordinatesChunk, ChunkStats>();
public static HashMap<CoordinatesChunk, StatsChunk> chunkMeanTime = new HashMap<CoordinatesChunk, StatsChunk>();
public static ArrayList<TicketData> tickets = new ArrayList<TicketData>();
public static HashMap<Integer, HashMap<ChunkCoordIntPair, Boolean>> getAllLoadedChunks(){
@@ -59,32 +59,32 @@ public class ChunkManager {
return tickets;
}
public static ArrayList<ChunkStats> getChunksUpdateTime(){
HashMap<CoordinatesChunk, ChunkStats> chunks = new HashMap<CoordinatesChunk, ChunkStats>();
public static ArrayList<StatsChunk> getChunksUpdateTime(){
HashMap<CoordinatesChunk, StatsChunk> chunks = new HashMap<CoordinatesChunk, StatsChunk>();
for (TileEntityStats stat : TileEntityManager.stats.values()){
for (StatsTileEntity stat : TileEntityManager.stats.values()){
if (!chunks.containsKey(stat.getChunk()))
chunks.put(stat.getChunk(), new ChunkStats(stat.getChunk()));
chunks.put(stat.getChunk(), new StatsChunk(stat.getChunk()));
chunks.get(stat.getChunk()).addTileEntity();
chunks.get(stat.getChunk()).addMeasure(stat.getGeometricMean());
}
for (EntityStats stat : EntityManager.stats.values()){
for (StatsEntity stat : EntityManager.stats.values()){
if (!chunks.containsKey(stat.getChunk()))
chunks.put(stat.getChunk(), new ChunkStats(stat.getChunk()));
chunks.put(stat.getChunk(), new StatsChunk(stat.getChunk()));
chunks.get(stat.getChunk()).addEntity();
chunks.get(stat.getChunk()).addMeasure(stat.getGeometricMean());
}
ArrayList<ChunkStats> chunksUpdate = new ArrayList<ChunkStats>(chunks.values());
ArrayList<StatsChunk> chunksUpdate = new ArrayList<StatsChunk>(chunks.values());
return chunksUpdate;
}
public static ArrayList<ChunkStats> getTopChunks(int quantity){
ArrayList<ChunkStats> chunks = ChunkManager.getChunksUpdateTime();
ArrayList<ChunkStats> outList = new ArrayList<ChunkStats>();
public static ArrayList<StatsChunk> getTopChunks(int quantity){
ArrayList<StatsChunk> chunks = ChunkManager.getChunksUpdateTime();
ArrayList<StatsChunk> outList = new ArrayList<StatsChunk>();
Collections.sort(chunks);
for (int i = 0; i < Math.min(quantity, chunks.size()); i++)
@@ -15,14 +15,14 @@ import net.minecraft.network.packet.Packet3Chat;
import net.minecraft.util.ChatMessageComponent;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
import mcp.mobius.opis.data.holders.AmountHolder;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.EntityStats;
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.stats.StatsEntity;
public class EntityManager {
public static HashMap<Integer, EntityStats> stats = new HashMap<Integer, EntityStats>();
public static HashMap<Integer, StatsEntity> stats = new HashMap<Integer, StatsEntity>();
/* Add an entity to the stat array, with timing data */
public static void addEntity(Entity ent, long timing){
@@ -31,20 +31,20 @@ public class EntityManager {
entName = getEntityName(ent); //ent.getClass().getName();
if (!(stats.containsKey(entID)))
stats.put(entID, new EntityStats(entID, entName, ent.dimension, ent.posX, ent.posY, ent.posZ));
stats.put(entID, new StatsEntity(entID, entName, ent.dimension, ent.posX, ent.posY, ent.posZ));
stats.get(entID).addMeasure(timing);
}
/* Returns the x slowest entities in all dimensions (with timing data) */
public static ArrayList<EntityStats> getTopEntities(int quantity){
ArrayList<EntityStats> sortedEntities = new ArrayList(EntityManager.stats.values());
ArrayList<EntityStats> topEntities = new ArrayList<EntityStats>();
public static ArrayList<StatsEntity> getTopEntities(int quantity){
ArrayList<StatsEntity> sortedEntities = new ArrayList(EntityManager.stats.values());
ArrayList<StatsEntity> topEntities = new ArrayList<StatsEntity>();
Collections.sort(sortedEntities);
int i = 0;
while (topEntities.size() < Math.min(quantity, sortedEntities.size()) && (i < sortedEntities.size()) ){
//for (int i = 0; i < Math.min(quantity, sortedEntities.size()); i++){
EntityStats testats = sortedEntities.get(i);
StatsEntity testats = sortedEntities.get(i);
if (testats.getDataPoints() < 40){
i++;
@@ -71,8 +71,8 @@ public class EntityManager {
}
/* Returns all the entities in all dimensions (without timing data) */
public static ArrayList<EntityStats> getAllEntities(){
ArrayList<EntityStats> entities = new ArrayList<EntityStats>();
public static ArrayList<StatsEntity> getAllEntities(){
ArrayList<StatsEntity> entities = new ArrayList<StatsEntity>();
for (int i : DimensionManager.getIDs()){
entities.addAll(EntityManager.getEntitiesInDim(i));
}
@@ -80,8 +80,8 @@ public class EntityManager {
}
/* Returns all the entities in the given dimension (without timing data) */
public static ArrayList<EntityStats> getEntitiesInDim(int dim){
ArrayList<EntityStats> entities = new ArrayList<EntityStats>();
public static ArrayList<StatsEntity> getEntitiesInDim(int dim){
ArrayList<StatsEntity> entities = new ArrayList<StatsEntity>();
World world = DimensionManager.getWorld(dim);
if (world == null) return entities;
@@ -91,15 +91,15 @@ public class EntityManager {
for (int i = 0; i < copyList.size(); i++){
Entity ent = (Entity)copyList.get(i);
//entities.add(new EntityStats(ent.entityId, ent.getClass().getName(), ent.dimension, ent.posX, ent.posY, ent.posZ));
entities.add(new EntityStats(ent.entityId, getEntityName(ent), ent.dimension, ent.posX, ent.posY, ent.posZ));
entities.add(new StatsEntity(ent.entityId, getEntityName(ent), ent.dimension, ent.posX, ent.posY, ent.posZ));
}
return entities;
}
/* Returns a hashmap of all entities per chunk (not timing) */
public static HashMap<CoordinatesChunk, ArrayList<EntityStats>> getAllEntitiesPerChunk(){
HashMap<CoordinatesChunk, ArrayList<EntityStats>> entities = new HashMap<CoordinatesChunk, ArrayList<EntityStats>>();
public static HashMap<CoordinatesChunk, ArrayList<StatsEntity>> getAllEntitiesPerChunk(){
HashMap<CoordinatesChunk, ArrayList<StatsEntity>> entities = new HashMap<CoordinatesChunk, ArrayList<StatsEntity>>();
for (int i : DimensionManager.getIDs()){
entities.putAll(EntityManager.getEntitiesPerChunkInDim(i));
}
@@ -107,8 +107,8 @@ public class EntityManager {
}
/* Returns a hashmap of entities in the given dimension (not timing) */
public static HashMap<CoordinatesChunk, ArrayList<EntityStats>> getEntitiesPerChunkInDim(int dim){
HashMap<CoordinatesChunk, ArrayList<EntityStats>> entities = new HashMap<CoordinatesChunk, ArrayList<EntityStats>>();
public static HashMap<CoordinatesChunk, ArrayList<StatsEntity>> getEntitiesPerChunkInDim(int dim){
HashMap<CoordinatesChunk, ArrayList<StatsEntity>> entities = new HashMap<CoordinatesChunk, ArrayList<StatsEntity>>();
World world = DimensionManager.getWorld(dim);
if (world == null) return entities;
@@ -119,18 +119,18 @@ public class EntityManager {
CoordinatesChunk chunk = new CoordinatesBlock(ent.dimension, (int)ent.posX, (int)ent.posY, (int)ent.posZ).asCoordinatesChunk();
if (!entities.containsKey(chunk))
entities.put(chunk, new ArrayList<EntityStats>());
entities.put(chunk, new ArrayList<StatsEntity>());
//entities.get(chunk).add(new EntityStats(ent.entityId, ent.getClass().getName(), ent.dimension, ent.posX, ent.posY, ent.posZ));
entities.get(chunk).add(new EntityStats(ent.entityId, getEntityName(ent), ent.dimension, ent.posX, ent.posY, ent.posZ));
entities.get(chunk).add(new StatsEntity(ent.entityId, getEntityName(ent), ent.dimension, ent.posX, ent.posY, ent.posZ));
}
return entities;
}
/* Returns an array of all entities in a given chunk */
public static ArrayList<EntityStats> getEntitiesInChunk(CoordinatesChunk coord){
ArrayList<EntityStats> entities = new ArrayList<EntityStats>();
public static ArrayList<StatsEntity> getEntitiesInChunk(CoordinatesChunk coord){
ArrayList<StatsEntity> entities = new ArrayList<StatsEntity>();
World world = DimensionManager.getWorld(coord.dim);
if (world == null) return entities;
@@ -142,7 +142,7 @@ public class EntityManager {
CoordinatesChunk chunk = new CoordinatesBlock(ent.dimension, (int)ent.posX, (int)ent.posY, (int)ent.posZ).asCoordinatesChunk();
if (chunk.equals(coord))
//entities.add(new EntityStats(ent.entityId, ent.getClass().getName(), ent.dimension, ent.posX, ent.posY, ent.posZ));
entities.add(new EntityStats(ent.entityId, getEntityName(ent), ent.dimension, ent.posX, ent.posY, ent.posZ));
entities.add(new StatsEntity(ent.entityId, getEntityName(ent), ent.dimension, ent.posX, ent.posY, ent.posZ));
}
return entities;
@@ -296,9 +296,9 @@ public class EntityManager {
}
public static double getTotalUpdateTime(){
ArrayList<EntityStats> entities = new ArrayList(stats.values());
ArrayList<StatsEntity> entities = new ArrayList(stats.values());
double updateTime = 0D;
for (EntityStats data : entities){
for (StatsEntity data : entities){
updateTime += data.getGeometricMean();
}
return updateTime;
@@ -7,12 +7,12 @@ import java.util.HashMap;
import cpw.mods.fml.common.IScheduledTickHandler;
import cpw.mods.fml.common.SingleIntervalHandler;
import mcp.mobius.opis.data.holders.TickHandlerStats;
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
public class TickHandlerManager {
public static HashMap<String, TickHandlerStats> startStats = new HashMap<String, TickHandlerStats>();
public static HashMap<String, TickHandlerStats> endStats = new HashMap<String, TickHandlerStats>();
public static HashMap<String, StatsTickHandler> startStats = new HashMap<String, StatsTickHandler>();
public static HashMap<String, StatsTickHandler> endStats = new HashMap<String, StatsTickHandler>();
public static Class SingleIntervalHandlerReflect;
public static Field wrapped;
@@ -33,7 +33,7 @@ public class TickHandlerManager {
String name = getHandlerName(handler);
if (!(startStats.containsKey(name)))
startStats.put(name, new TickHandlerStats(name));
startStats.put(name, new StatsTickHandler(name));
startStats.get(name).addMeasure(timing);
}
@@ -41,20 +41,20 @@ public class TickHandlerManager {
String name = getHandlerName(handler);
if (!(endStats.containsKey(name)))
endStats.put(name, new TickHandlerStats(name));
endStats.put(name, new StatsTickHandler(name));
endStats.get(name).addMeasure(timing);
}
public static ArrayList<TickHandlerStats> getCumulatedStats(){
HashMap<String, TickHandlerStats> totalStats = new HashMap<String, TickHandlerStats>();
public static ArrayList<StatsTickHandler> getCumulatedStats(){
HashMap<String, StatsTickHandler> totalStats = new HashMap<String, StatsTickHandler>();
for (String key : startStats.keySet()){
totalStats.put(key, new TickHandlerStats(key));
totalStats.put(key, new StatsTickHandler(key));
totalStats.get(key).setGeometricMean(startStats.get(key).getGeometricMean() + endStats.get(key).getGeometricMean());
totalStats.get(key).dataPoints = startStats.get(key).getDataPoints() + endStats.get(key).getDataPoints();
}
ArrayList<TickHandlerStats> sortedStats = new ArrayList(totalStats.values());
ArrayList<StatsTickHandler> sortedStats = new ArrayList(totalStats.values());
Collections.sort(sortedStats);
return sortedStats;
@@ -82,9 +82,9 @@ public class TickHandlerManager {
}
public static double getTotalUpdateTime(){
ArrayList<TickHandlerStats> tickCumul = getCumulatedStats();
ArrayList<StatsTickHandler> tickCumul = getCumulatedStats();
double updateTime = 0D;
for (TickHandlerStats data : tickCumul){
for (StatsTickHandler data : tickCumul){
updateTime += data.getGeometricMean();
}
return updateTime;
@@ -6,11 +6,11 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import mcp.mobius.opis.data.holders.ChunkStats;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.ModStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
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.tools.ModIdentification;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
@@ -22,7 +22,7 @@ import net.minecraftforge.common.DimensionManager;
public class TileEntityManager {
public static HashMap<CoordinatesBlock, Class> references = new HashMap<CoordinatesBlock, Class>();
public static HashMap<CoordinatesBlock, TileEntityStats> stats = new HashMap<CoordinatesBlock, TileEntityStats>();
public static HashMap<CoordinatesBlock, StatsTileEntity> stats = new HashMap<CoordinatesBlock, StatsTileEntity>();
public static void addTileEntity(TileEntity te, long timing){
CoordinatesBlock coord = new CoordinatesBlock(te);
@@ -51,7 +51,7 @@ public class TileEntityManager {
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 TileEntityStats(coord, blockID, blockMeta));
stats.put(coord, new StatsTileEntity(coord, blockID, blockMeta));
//stats.put(coord, new TileEntityStats(coord, teName));
}
@@ -59,15 +59,15 @@ public class TileEntityManager {
stats.get(coord).addMeasure(timing);
}
public static HashMap<CoordinatesChunk, ChunkStats> getTimes(int dim){
HashMap<CoordinatesChunk, ChunkStats> chunks = new HashMap<CoordinatesChunk, ChunkStats>();
public static HashMap<CoordinatesChunk, StatsChunk> getTimes(int dim){
HashMap<CoordinatesChunk, StatsChunk> chunks = new HashMap<CoordinatesChunk, StatsChunk>();
for (CoordinatesBlock coord : TileEntityManager.stats.keySet()){
if (coord.dim == dim){
CoordinatesChunk coordC = new CoordinatesChunk(coord);
if (!(chunks.containsKey(coordC)))
chunks.put(coordC, new ChunkStats());
chunks.put(coordC, new StatsChunk());
chunks.get(coordC).addEntity();
chunks.get(coordC).addMeasure(stats.get(coord).getGeometricMean());
@@ -95,14 +95,14 @@ public class TileEntityManager {
}
}
public static ArrayList<TileEntityStats> getTileEntitiesInChunk(CoordinatesChunk coord){
public static ArrayList<StatsTileEntity> getTileEntitiesInChunk(CoordinatesChunk coord){
cleanUpStats();
ArrayList<TileEntityStats> returnList = new ArrayList<TileEntityStats>();
ArrayList<StatsTileEntity> returnList = new ArrayList<StatsTileEntity>();
for (CoordinatesBlock tecoord : TileEntityManager.stats.keySet()){
if (coord.equals(new CoordinatesChunk(tecoord))){
TileEntityStats testats = TileEntityManager.stats.get(tecoord);
StatsTileEntity testats = TileEntityManager.stats.get(tecoord);
/*
int x = testats.getCoordinates().x;
@@ -131,16 +131,16 @@ public class TileEntityManager {
return returnList;
}
public static ArrayList<TileEntityStats> getTopEntities(int quantity){
public static ArrayList<StatsTileEntity> getTopEntities(int quantity){
cleanUpStats();
ArrayList<TileEntityStats> sortedEntities = new ArrayList(TileEntityManager.stats.values());
ArrayList<TileEntityStats> topEntities = new ArrayList<TileEntityStats>();
ArrayList<StatsTileEntity> sortedEntities = new ArrayList(TileEntityManager.stats.values());
ArrayList<StatsTileEntity> topEntities = new ArrayList<StatsTileEntity>();
Collections.sort(sortedEntities);
for (int i = 0; i < Math.min(quantity, sortedEntities.size()); i++){
TileEntityStats testats = sortedEntities.get(i);
StatsTileEntity testats = sortedEntities.get(i);
topEntities.add(testats);
}
@@ -148,27 +148,27 @@ public class TileEntityManager {
}
public static double getTotalUpdateTime(){
ArrayList<TileEntityStats> entities = new ArrayList(TileEntityManager.stats.values());
ArrayList<StatsTileEntity> entities = new ArrayList(TileEntityManager.stats.values());
double updateTime = 0D;
for (TileEntityStats data : entities){
for (StatsTileEntity data : entities){
updateTime += data.getGeometricMean();
}
return updateTime;
}
public static ArrayList<ModStats> getModStats(){
public static ArrayList<StatsMod> getModStats(){
cleanUpStats();
HashMap<String, ModStats> modStats = new HashMap<String, ModStats>();
HashMap<String, StatsMod> modStats = new HashMap<String, StatsMod>();
for (TileEntityStats testat : TileEntityManager.stats.values()){
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 ModStats(modID));
modStats.put(modID, new StatsMod(modID));
modStats.get(modID).addStat(testat);
}
ArrayList<ModStats> outModStats = new ArrayList<ModStats>(modStats.values());
ArrayList<StatsMod> outModStats = new ArrayList<StatsMod>(modStats.values());
//Collections.sort(outModStats);
@@ -1,7 +1,7 @@
package mcp.mobius.opis.data.server;
import mcp.mobius.mobiuscore.profiler.IProfilerTick;
import mcp.mobius.opis.data.holders.TickStats;
import mcp.mobius.opis.data.holders.stats.StatsTick;
public class TickProfiler extends AbstractProfiler implements IProfilerTick {
@@ -9,7 +9,7 @@ public class TickProfiler extends AbstractProfiler implements IProfilerTick {
public static TickProfiler instance() {return _instance;}
private Clock clock = new Clock();
public TickStats stats = new TickStats();
public StatsTick stats = new StatsTick();
public int profiledTicks = 0;
@Override
@@ -1,13 +1,13 @@
package mcp.mobius.opis.data.server;
import mcp.mobius.mobiuscore.profiler.IProfilerWorldTick;
import mcp.mobius.opis.data.holders.WorldTickStats;
import mcp.mobius.opis.data.holders.stats.StatsWorldTick;
public class WorldTickProfiler extends AbstractProfiler implements IProfilerWorldTick {
private static WorldTickProfiler _instance = new WorldTickProfiler();
public static WorldTickProfiler instance() {return _instance;}
public WorldTickStats stats = new WorldTickStats();
public StatsWorldTick stats = new StatsWorldTick();
@Override
public void WorldTickStart() {
+3 -3
View File
@@ -5,7 +5,7 @@ import java.util.Collections;
import net.minecraft.client.gui.GuiScreen;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.holders.ModStats;
import mcp.mobius.opis.data.holders.stats.StatsMod;
import mcp.mobius.opis.gui.interfaces.CType;
import mcp.mobius.opis.gui.interfaces.WAlign;
import mcp.mobius.opis.gui.widgets.WidgetGeometry;
@@ -13,7 +13,7 @@ import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
public class ScreenMods extends ScreenBase {
public ScreenMods(GuiScreen parent, ArrayList<ModStats> mods) {
public ScreenMods(GuiScreen parent, ArrayList<StatsMod> mods) {
super(parent);
Collections.sort(mods);
@@ -52,7 +52,7 @@ public class ScreenMods extends ScreenBase {
}
*/
for (ModStats data : mods){
for (StatsMod data : mods){
if (modOpis.microseconds)
table.addRow(data,
String.format("%s", data.getModID()),
+9 -9
View File
@@ -39,12 +39,12 @@ import mapwriter.api.MwAPI;
import mapwriter.gui.MwGui;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.client.DataCache;
import mcp.mobius.opis.data.holders.AmountHolder;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.TargetEntity;
import mcp.mobius.opis.data.holders.TileEntityStats;
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.basetypes.TargetEntity;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
import mcp.mobius.opis.data.managers.TileEntityManager;
import mcp.mobius.opis.network.client.Packet_ReqData;
import mcp.mobius.opis.network.enums.DataReq;
@@ -855,7 +855,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
else if ((e.getSource() == btnTimingTECenterMap) && (tableTimingTE.getSelectedRow() != -1)){
int indexData = tableTimingTE.convertRowIndexToModel(tableTimingTE.getSelectedRow());
TileEntityStats data = DataCache.instance().getTimingTileEnts().get(indexData);
StatsTileEntity data = DataCache.instance().getTimingTileEnts().get(indexData);
CoordinatesBlock coord = data.getCoordinates();
OverlayMeanTime.instance().setSelectedChunk(coord.dim, coord.x >> 4, coord.z >> 4);
@@ -865,7 +865,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
else if ((e.getSource() == btnTimingTETeleport) && (tableTimingTE.getSelectedRow() != -1)){
int indexData = tableTimingTE.convertRowIndexToModel(tableTimingTE.getSelectedRow());
TileEntityStats data = DataCache.instance().getTimingTileEnts().get(indexData);
StatsTileEntity data = DataCache.instance().getTimingTileEnts().get(indexData);
CoordinatesBlock coord = data.getCoordinates();
modOpis.selectedBlock = coord;
@@ -875,7 +875,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
else if ((e.getSource() == btnTimingEntCenterMap) && (tableTimingEnt.getSelectedRow() != -1)){
int indexData = tableTimingEnt.convertRowIndexToModel(tableTimingEnt.getSelectedRow());
EntityStats data = DataCache.instance().getTimingEntities().get(indexData);
StatsEntity data = DataCache.instance().getTimingEntities().get(indexData);
CoordinatesBlock coord = data.getCoordinates();
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.OVERLAY, DataReq.CHUNK, DataReq.ENTITIES));
@@ -887,7 +887,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
else if ((e.getSource() == btnTimingEntTeleport) && (tableTimingEnt.getSelectedRow() != -1)){
int indexData = tableTimingEnt.convertRowIndexToModel(tableTimingEnt.getSelectedRow());
EntityStats data = DataCache.instance().getTimingEntities().get(indexData);
StatsEntity data = DataCache.instance().getTimingEntities().get(indexData);
int eid = data.getID();
int dim = data.getCoordinates().dim;
+1 -1
View File
@@ -30,7 +30,7 @@ import mcp.mobius.opis.commands.server.CommandTicks;
import mcp.mobius.opis.commands.server.CommandTimingEntities;
import mcp.mobius.opis.commands.server.CommandTimingTileEntities;
import mcp.mobius.opis.data.client.TickHandlerClientProfiler;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.server.EntityProfiler;
import mcp.mobius.opis.data.server.HandlerProfiler;
import mcp.mobius.opis.data.server.WorldTickProfiler;
@@ -12,7 +12,7 @@ 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.holders.stats.StatsTickHandler;
import mcp.mobius.opis.data.managers.MetaManager;
import mcp.mobius.opis.data.managers.TickHandlerManager;
import mcp.mobius.opis.gui.swing.SwingUI;
@@ -41,8 +41,8 @@ public class ClientCommandHandler {
}
else if (cmd == ClientCommand.SHOW_RENDER_TICK){
modOpis.log.log(Level.INFO, "=== RENDER TICK ===");
ArrayList<TickHandlerStats> stats = TickHandlerManager.getCumulatedStats();
for (TickHandlerStats stat : stats){
ArrayList<StatsTickHandler> stats = TickHandlerManager.getCumulatedStats();
for (StatsTickHandler stat : stats){
System.out.printf("%s \n", stat);
}
}
+13 -13
View File
@@ -11,18 +11,18 @@ import cpw.mods.fml.common.network.Player;
import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.commands.server.CommandAmountEntities;
import mcp.mobius.opis.data.holders.AmountHolder;
import mcp.mobius.opis.data.holders.ChunkStats;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.TargetEntity;
import mcp.mobius.opis.data.holders.TickHandlerStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
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.basetypes.SerialDouble;
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
import mcp.mobius.opis.data.holders.basetypes.SerialString;
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
import mcp.mobius.opis.data.managers.ChunkManager;
import mcp.mobius.opis.data.managers.EntityManager;
import mcp.mobius.opis.data.managers.MetaManager;
@@ -82,28 +82,28 @@ public class DataReqHandler {
}
else if ((maintype == DataReq.LIST) && (subtype == DataReq.TIMING) && (target == DataReq.TILETENTS)){
ArrayList<TileEntityStats> timingTileEnts = TileEntityManager.getTopEntities(100);
ArrayList<StatsTileEntity> timingTileEnts = TileEntityManager.getTopEntities(100);
SerialDouble totalTime = new SerialDouble(TileEntityManager.getTotalUpdateTime());
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create (DataReq.LIST, DataReq.TIMING, DataReq.TILETENTS, timingTileEnts), (Player)player);
PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.TIMING, DataReq.TILETENTS, totalTime), (Player)player);
}
else if ((maintype == DataReq.LIST) && (subtype == DataReq.TIMING) && (target == DataReq.ENTITIES)){
ArrayList<EntityStats> timingEntities = EntityManager.getTopEntities(100);
ArrayList<StatsEntity> timingEntities = EntityManager.getTopEntities(100);
SerialDouble totalTime = new SerialDouble(EntityManager.getTotalUpdateTime());
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.TIMING, DataReq.ENTITIES, timingEntities), (Player)player);
PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.TIMING, DataReq.ENTITIES, totalTime), (Player)player);
}
else if ((maintype == DataReq.LIST) && (subtype == DataReq.TIMING) && (target == DataReq.HANDLERS)){
ArrayList<TickHandlerStats> timingHandlers = TickHandlerManager.getCumulatedStats();
ArrayList<StatsTickHandler> timingHandlers = TickHandlerManager.getCumulatedStats();
SerialDouble totalTime = new SerialDouble(TickHandlerManager.getTotalUpdateTime());
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.TIMING, DataReq.HANDLERS, timingHandlers), (Player)player);
PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.TIMING, DataReq.HANDLERS, totalTime), (Player)player);
}
else if ((maintype == DataReq.LIST) && (subtype == DataReq.TIMING) && (target == DataReq.CHUNK)){
ArrayList<ChunkStats> timingChunks = ChunkManager.getTopChunks(100);
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.TIMING, DataReq.CHUNK, timingChunks), (Player)player);
}
@@ -158,7 +158,7 @@ public class DataReqHandler {
public void handleOverlayChunkEntities(CoordinatesChunk coord, Player player){
HashMap<CoordinatesChunk, ArrayList<EntityStats>> entities = EntityManager.getAllEntitiesPerChunk();
HashMap<CoordinatesChunk, ArrayList<StatsEntity>> entities = EntityManager.getAllEntitiesPerChunk();
HashMap<CoordinatesChunk, Integer> perChunk = new HashMap<CoordinatesChunk, Integer>();
for (CoordinatesChunk chunk : entities.keySet())
@@ -8,13 +8,13 @@ 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.TickHandlerStats;
import mcp.mobius.opis.data.holders.TicketData;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
import mcp.mobius.opis.data.holders.basetypes.TicketData;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
import mcp.mobius.opis.data.managers.ChunkManager;
import mcp.mobius.opis.data.managers.EntityManager;
import mcp.mobius.opis.data.managers.TileEntityManager;
@@ -8,7 +8,7 @@ import java.io.IOException;
import java.util.ArrayList;
import net.minecraft.network.packet.Packet250CustomPayload;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
import mcp.mobius.opis.network.Packets;
public class Packet_ReqChunks {
@@ -9,10 +9,10 @@ import java.lang.reflect.Method;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.TargetEntity;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
import mcp.mobius.opis.network.Packets;
import mcp.mobius.opis.network.enums.DataReq;
@@ -8,13 +8,13 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import mcp.mobius.opis.data.holders.AmountHolder;
import mcp.mobius.opis.data.holders.ChunkStats;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.StatAbstract;
import mcp.mobius.opis.data.holders.TickHandlerStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
import mcp.mobius.opis.data.holders.stats.StatAbstract;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
import mcp.mobius.opis.network.Packets;
import mcp.mobius.opis.network.enums.DataReq;
import net.minecraft.network.packet.Packet;
@@ -7,7 +7,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.HashMap;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
import mcp.mobius.opis.network.Packets;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.world.ChunkCoordIntPair;
@@ -7,15 +7,15 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.HashMap;
import mcp.mobius.opis.data.holders.ChunkStats;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.network.Packets;
import net.minecraft.network.packet.Packet250CustomPayload;
public class Packet_MeanTime {
public byte header;
public HashMap<CoordinatesChunk, ChunkStats> chunkStatus = new HashMap<CoordinatesChunk, ChunkStats>();
public HashMap<CoordinatesChunk, StatsChunk> chunkStatus = new HashMap<CoordinatesChunk, StatsChunk>();
public Packet_MeanTime(Packet250CustomPayload packet) {
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
@@ -28,14 +28,14 @@ public class Packet_MeanTime {
for (int i = 0; i <= nchunks; i++){
CoordinatesChunk coord = new CoordinatesChunk(dim, inputStream.readInt(), inputStream.readInt());
this.chunkStatus.put(coord, new ChunkStats(coord, inputStream.readInt(), inputStream.readInt(), inputStream.readDouble()));
this.chunkStatus.put(coord, new StatsChunk(coord, inputStream.readInt(), inputStream.readInt(), inputStream.readDouble()));
}
} catch (IOException e){}
}
public static Packet250CustomPayload create(HashMap<CoordinatesChunk, ChunkStats> chunks, int dim){
public static Packet250CustomPayload create(HashMap<CoordinatesChunk, StatsChunk> chunks, int dim){
Packet250CustomPayload packet = new Packet250CustomPayload();
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
DataOutputStream outputStream = new DataOutputStream(bos);
@@ -8,13 +8,13 @@ import java.io.IOException;
import java.util.ArrayList;
import net.minecraft.network.packet.Packet250CustomPayload;
import mcp.mobius.opis.data.holders.ModStats;
import mcp.mobius.opis.data.holders.stats.StatsMod;
import mcp.mobius.opis.network.Packets;
public class Packet_ModMeanTime {
public byte header;
public ArrayList<ModStats> modStats = new ArrayList<ModStats>();
public ArrayList<StatsMod> modStats = new ArrayList<StatsMod>();
public Packet_ModMeanTime(Packet250CustomPayload packet) {
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
@@ -23,11 +23,11 @@ public class Packet_ModMeanTime {
this.header = inputStream.readByte();
int ndata = inputStream.readInt();
for (int i = 0; i < ndata; i++)
modStats.add(ModStats.readFromStream(inputStream));
modStats.add(StatsMod.readFromStream(inputStream));
} catch (IOException e){}
}
public static Packet250CustomPayload create(ArrayList<ModStats> stats){
public static Packet250CustomPayload create(ArrayList<StatsMod> stats){
Packet250CustomPayload packet = new Packet250CustomPayload();
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
DataOutputStream outputStream = new DataOutputStream(bos);
@@ -35,7 +35,7 @@ public class Packet_ModMeanTime {
try{
outputStream.writeByte(Packets.MODMEANTIME);
outputStream.writeInt(stats.size());
for (ModStats data : stats)
for (StatsMod data : stats)
data.writeToStream(outputStream);
}catch(IOException e){}
@@ -7,7 +7,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.HashSet;
import mcp.mobius.opis.data.holders.TicketData;
import mcp.mobius.opis.data.holders.basetypes.TicketData;
import mcp.mobius.opis.network.Packets;
import net.minecraft.network.packet.Packet250CustomPayload;
@@ -17,10 +17,10 @@ import mapwriter.api.IMwChunkOverlay;
import mapwriter.api.IMwDataProvider;
import mapwriter.map.MapView;
import mapwriter.map.mapmode.MapMode;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.TicketData;
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.basetypes.TicketData;
import mcp.mobius.opis.data.managers.ChunkManager;
import mcp.mobius.opis.gui.events.MouseEvent;
import mcp.mobius.opis.gui.interfaces.CType;
+5 -5
View File
@@ -19,11 +19,11 @@ import mapwriter.api.IMwDataProvider;
import mapwriter.map.MapView;
import mapwriter.map.mapmode.MapMode;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.TileEntityStats;
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.stats.StatsTileEntity;
import mcp.mobius.opis.data.managers.ChunkManager;
import mcp.mobius.opis.gui.events.MouseEvent;
import mcp.mobius.opis.gui.interfaces.CType;
@@ -59,7 +59,7 @@ public class OverlayMeanTime implements IMwDataProvider {
public void onMouseClick(MouseEvent event){
TableRow row = this.getRow(event.x, event.y);
if (row != null){
CoordinatesBlock coord = ((TileEntityStats)row.getObject()).getCoordinates();
CoordinatesBlock coord = ((StatsTileEntity)row.getObject()).getCoordinates();
if (this.mapView.getX() != coord.x || this.mapView.getZ() != coord.z){
this.mapView.setViewCentre(coord.x, coord.z);
@@ -278,7 +278,7 @@ public class OverlayMeanTime implements IMwDataProvider {
for (ISerializable uncasted : entities){
TileEntityStats data = (TileEntityStats)uncasted;
StatsTileEntity data = (StatsTileEntity)uncasted;
ItemStack is;
String name = String.format("te.%d.%d", data.getID(), data.getMeta());
@@ -15,10 +15,10 @@ import mapwriter.api.IMwChunkOverlay;
import mapwriter.api.IMwDataProvider;
import mapwriter.map.MapView;
import mapwriter.map.mapmode.MapMode;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.CoordinatesChunk;
import mcp.mobius.opis.data.holders.EntityStats;
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.stats.StatsEntity;
import mcp.mobius.opis.gui.events.MouseEvent;
import mcp.mobius.opis.gui.interfaces.CType;
import mcp.mobius.opis.gui.interfaces.IWidget;
@@ -55,7 +55,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider {
public LayoutCanvas canvas = null;
public HashMap<CoordinatesChunk, Integer> overlayData = new HashMap<CoordinatesChunk, Integer>();
public ArrayList<ReducedData> reducedData = new ArrayList<ReducedData>();
public ArrayList<EntityStats> entStats = new ArrayList<EntityStats>();
public ArrayList<StatsEntity> entStats = new ArrayList<StatsEntity>();
CoordinatesChunk selectedChunk = null;
private OverlayEntityPerChunk(){}
@@ -69,7 +69,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider {
public void setEntStats(ArrayList<ISerializable> data){
this.entStats.clear();
for (ISerializable stat : data)
this.entStats.add((EntityStats)stat);
this.entStats.add((StatsEntity)stat);
}
public void reduceData(){
@@ -237,7 +237,7 @@ public class OverlayEntityPerChunk implements IMwDataProvider {
.setFontSize(1.0f);
int nrows = 0;
for (EntityStats data : this.entStats){
for (StatsEntity data : this.entStats){
//String[] namelst = data.getName().split("\\.");
//String name = namelst[namelst.length - 1];
@@ -4,7 +4,7 @@ import net.minecraft.util.MathHelper;
import cpw.mods.fml.common.network.PacketDispatcher;
import mapwriter.map.MapView;
import mapwriter.map.mapmode.MapMode;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.gui.events.MouseEvent;
import mcp.mobius.opis.gui.interfaces.IWidget;
import mcp.mobius.opis.gui.widgets.tableview.TableRow;
@@ -5,9 +5,9 @@ import net.minecraft.client.Minecraft;
import net.minecraft.util.MathHelper;
import mapwriter.map.MapView;
import mapwriter.map.mapmode.MapMode;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.TargetEntity;
import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.gui.events.MouseEvent;
import mcp.mobius.opis.gui.interfaces.IWidget;
import mcp.mobius.opis.gui.widgets.tableview.TableRow;
@@ -37,8 +37,8 @@ public class TableEntities extends ViewTable {
if (row != null){
//CoordinatesBlock coord = ((EntityStats)row.getObject()).getCoord();
//PacketDispatcher.sendPacketToServer(Packet_ReqTeleport.create(coord));
int eid = ((EntityStats)row.getObject()).getID();
int dim = ((EntityStats)row.getObject()).getCoordinates().dim;
int eid = ((StatsEntity)row.getObject()).getID();
int dim = ((StatsEntity)row.getObject()).getCoordinates().dim;
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.COMMAND, DataReq.TELEPORT, DataReq.ENTITIES, new TargetEntity(eid, dim)));
Minecraft.getMinecraft().setIngameFocus();
}
+6 -6
View File
@@ -9,11 +9,11 @@ import cpw.mods.fml.relauncher.SideOnly;
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.TickHandlerStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.ModStats;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.data.holders.stats.StatsMod;
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
import mcp.mobius.opis.gui.font.Fonts;
import mcp.mobius.opis.gui.font.TrueTypeFont;
import mcp.mobius.opis.gui.screens.ScreenBase;
@@ -45,7 +45,7 @@ public class ProxyClient extends ProxyServer {
}
@Override
public void displayModList(ArrayList<ModStats> stats){
public void displayModList(ArrayList<StatsMod> stats){
ScreenBase screenMods = new ScreenMods(null, stats);
screenMods.display();
}
+6 -6
View File
@@ -4,15 +4,15 @@ import java.util.ArrayList;
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.TickHandlerStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.data.holders.stats.StatsMod;
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
import mcp.mobius.opis.overlay.OverlayStatus;
public class ProxyServer {
public void init(){}
public void displayModList(ArrayList<ModStats> stats){}
public void displayModList(ArrayList<StatsMod> stats){}
}
@@ -10,13 +10,13 @@ import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.packet.Packet3Chat;
import net.minecraft.util.ChatMessageComponent;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.holders.AmountHolder;
import mcp.mobius.opis.data.holders.ChunkStats;
import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.TickHandlerStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.holders.basetypes.AmountHolder;
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
import mcp.mobius.opis.data.holders.stats.StatsChunk;
import mcp.mobius.opis.data.holders.stats.StatsEntity;
import mcp.mobius.opis.data.holders.stats.StatsTickHandler;
import mcp.mobius.opis.data.holders.stats.StatsTileEntity;
import mcp.mobius.opis.data.managers.ChunkManager;
import mcp.mobius.opis.data.managers.EntityManager;
import mcp.mobius.opis.data.managers.TickHandlerManager;
@@ -80,10 +80,10 @@ public class OpisServerTickHandler implements ITickHandler {
// Here we should send a full update to all the clients registered
ArrayList<TickHandlerStats> timingHandlers = TickHandlerManager.getCumulatedStats();
ArrayList<EntityStats> timingEntities = EntityManager.getTopEntities(100);
ArrayList<TileEntityStats> timingTileEnts = TileEntityManager.getTopEntities(100);
ArrayList<ChunkStats> timingChunks = ChunkManager.getTopChunks(100);
ArrayList<StatsTickHandler> timingHandlers = TickHandlerManager.getCumulatedStats();
ArrayList<StatsEntity> timingEntities = EntityManager.getTopEntities(100);
ArrayList<StatsTileEntity> timingTileEnts = TileEntityManager.getTopEntities(100);
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
SerialDouble totalTimeTE = new SerialDouble(TileEntityManager.getTotalUpdateTime());
SerialDouble totalTimeEnt = new SerialDouble(EntityManager.getTotalUpdateTime());
SerialDouble totalTimeHandler = new SerialDouble(TickHandlerManager.getTotalUpdateTime());