mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-20 04:09:41 +00:00
Added Teleport option to Chunk list.
Fixed coordinate derp in stats. Removed the MeanTime Packet
This commit is contained in:
1 parent
f2e2416523
commit
a519d718e1
14 files changed
+93
-119
No files matched your search
@@ -282,7 +282,7 @@ public class DataCache {
|
||||
for (StatsChunk stat : DataCache.instance().getTimingChunks()){
|
||||
model.addRow(new Object[] {
|
||||
stat.getChunk().dim,
|
||||
String.format("[ %4d %4d ]", stat.getChunk().x, stat.getChunk().z),
|
||||
String.format("[ %4d %4d ]", stat.getChunk().chunkX, stat.getChunk().chunkZ),
|
||||
stat.tileEntities,
|
||||
stat.entities,
|
||||
stat});
|
||||
|
||||
@@ -14,8 +14,8 @@ public abstract class StatAbstract implements Comparable, ISerializable{
|
||||
public Long dataPoints = 0L;
|
||||
protected Double geomMean = null;
|
||||
protected Double dataSum = null;
|
||||
protected CoordinatesBlock coord = null;
|
||||
protected CoordinatesChunk chunk = null;
|
||||
protected CoordinatesBlock coord = new CoordinatesBlock(0,0,0,0);
|
||||
protected CoordinatesChunk chunk = new CoordinatesChunk(0,0,0);
|
||||
protected String name;
|
||||
|
||||
public void addMeasure(long timing){
|
||||
@@ -71,7 +71,7 @@ public abstract class StatAbstract implements Comparable, ISerializable{
|
||||
public String getName(){ return this.name; };
|
||||
|
||||
public CoordinatesBlock getCoordinates(){return this.coord;}
|
||||
public CoordinatesChunk getChunk(){return new CoordinatesChunk(this.getCoordinates());}
|
||||
public CoordinatesChunk getChunk(){return this.chunk;}
|
||||
|
||||
public abstract void writeToStream(DataOutputStream stream) throws IOException;
|
||||
|
||||
|
||||
@@ -14,16 +14,19 @@ public class StatsChunk extends StatAbstract{
|
||||
|
||||
public StatsChunk(CoordinatesChunk chunk){
|
||||
this.chunk = chunk;
|
||||
this.coord = chunk.asCoordinatesBlock();
|
||||
}
|
||||
|
||||
public StatsChunk(CoordinatesChunk chunk, int tileEntities, int entities){
|
||||
this.chunk = chunk;
|
||||
this.coord = chunk.asCoordinatesBlock();
|
||||
this.tileEntities = tileEntities;
|
||||
this.entities = entities;
|
||||
}
|
||||
|
||||
public StatsChunk(CoordinatesChunk chunk, int tileEntities, int entities, double time){
|
||||
this.chunk = chunk;
|
||||
this.coord = chunk.asCoordinatesBlock();
|
||||
this.tileEntities = tileEntities;
|
||||
this.entities = entities;
|
||||
this.setDataSum(time);
|
||||
@@ -37,11 +40,6 @@ public class StatsChunk extends StatAbstract{
|
||||
this.entities += 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CoordinatesChunk getChunk(){
|
||||
return this.chunk;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToStream(DataOutputStream stream) throws IOException{
|
||||
this.chunk.writeToStream(stream);
|
||||
|
||||
@@ -15,20 +15,21 @@ import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
|
||||
public class StatsEntity extends StatAbstract implements ISerializable {
|
||||
|
||||
private int entId;
|
||||
private int dim;
|
||||
private double cachedMedian = -1.0;
|
||||
private double x, y, z;
|
||||
|
||||
public StatsEntity(int entId, String name, int dim, double x, double y, double z){
|
||||
this.entId = entId;
|
||||
this.name = name;
|
||||
this.dim = dim;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.z = z;
|
||||
this.coord = new CoordinatesBlock(dim, x, y, z);
|
||||
this.chunk = this.coord.asCoordinatesChunk();
|
||||
}
|
||||
|
||||
|
||||
public StatsEntity(int entId, String name, CoordinatesBlock coord){
|
||||
this.entId = entId;
|
||||
this.name = name;
|
||||
this.coord = coord;
|
||||
this.chunk = this.coord.asCoordinatesChunk();
|
||||
}
|
||||
|
||||
public int getID(){ return this.entId; }
|
||||
|
||||
@@ -51,26 +52,18 @@ public class StatsEntity extends StatAbstract implements ISerializable {
|
||||
return String.format("%.3f µs", this.getGeometricMean());
|
||||
}
|
||||
|
||||
@Override
|
||||
public CoordinatesBlock getCoordinates(){
|
||||
return new CoordinatesBlock(this.dim, this.x, this.y, this.z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToStream(DataOutputStream stream) throws IOException{
|
||||
this.coord.writeToStream(stream);
|
||||
stream.writeInt(this.entId);
|
||||
Packet.writeString(this.name, stream);
|
||||
stream.writeInt(this.dim);
|
||||
stream.writeDouble(this.x);
|
||||
stream.writeDouble(this.y);
|
||||
stream.writeDouble(this.z);
|
||||
stream.writeDouble(this.getGeometricMean());
|
||||
stream.writeLong(this.getDataPoints());
|
||||
}
|
||||
|
||||
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());
|
||||
CoordinatesBlock coord = CoordinatesBlock.readFromStream(stream);
|
||||
StatsEntity stats = new StatsEntity(stream.readInt(), Packet.readString(stream, 255), coord);
|
||||
stats.setGeometricMean(stream.readDouble());
|
||||
stats.setDataPoints(stream.readLong());
|
||||
return stats;
|
||||
|
||||
@@ -20,6 +20,7 @@ public class StatsTileEntity extends StatAbstract implements ISerializable {
|
||||
|
||||
public StatsTileEntity(CoordinatesBlock coord, int blockID, short blockMeta){
|
||||
this.coord = coord;
|
||||
this.chunk = coord.asCoordinatesChunk();
|
||||
//this.name = teclass;
|
||||
this.blockID = blockID;
|
||||
this.blockMeta = blockMeta;
|
||||
|
||||
@@ -8,6 +8,7 @@ import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TicketData;
|
||||
import mcp.mobius.opis.data.holders.stats.StatsChunk;
|
||||
@@ -22,10 +23,20 @@ public class ChunkManager {
|
||||
|
||||
|
||||
|
||||
public static HashMap<ChunkCoordIntPair, Boolean> chunksLoad = new HashMap<ChunkCoordIntPair, Boolean>();
|
||||
public static HashMap<CoordinatesChunk, StatsChunk> chunkMeanTime = new HashMap<CoordinatesChunk, StatsChunk>();
|
||||
public static ArrayList<TicketData> tickets = new ArrayList<TicketData>();
|
||||
public static HashMap<ChunkCoordIntPair, Boolean> chunksLoad = new HashMap<ChunkCoordIntPair, Boolean>();
|
||||
private static HashMap<CoordinatesChunk, StatsChunk> chunkMeanTime = new HashMap<CoordinatesChunk, StatsChunk>();
|
||||
public static ArrayList<TicketData> tickets = new ArrayList<TicketData>();
|
||||
|
||||
public static void setChunkMeanTime(ArrayList<ISerializable> stats){
|
||||
chunkMeanTime.clear();
|
||||
for (ISerializable stat : stats)
|
||||
chunkMeanTime.put(((StatsChunk)stat).getChunk(), (StatsChunk)stat);
|
||||
}
|
||||
|
||||
public static HashMap<CoordinatesChunk, StatsChunk> getChunkMeanTime(){
|
||||
return chunkMeanTime;
|
||||
}
|
||||
|
||||
public static HashMap<Integer, HashMap<ChunkCoordIntPair, Boolean>> getAllLoadedChunks(){
|
||||
HashMap<Integer, HashMap<ChunkCoordIntPair, Boolean>> chunkStatus = new HashMap<Integer, HashMap<ChunkCoordIntPair, Boolean>>();
|
||||
for (int dim : DimensionManager.getIDs())
|
||||
|
||||
@@ -43,9 +43,11 @@ import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.client.DataCache;
|
||||
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.SerialString;
|
||||
import mcp.mobius.opis.data.holders.basetypes.TargetEntity;
|
||||
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.StatsTileEntity;
|
||||
import mcp.mobius.opis.data.managers.TileEntityManager;
|
||||
@@ -132,6 +134,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi
|
||||
private JLabel lblNewLabel_4;
|
||||
private JLabel lblNewLabel_5;
|
||||
private JLabel lblNewLabel_6;
|
||||
private JButton btnTimingChunkTeleportToChunk;
|
||||
|
||||
public void showUI(){
|
||||
EventQueue.invokeLater(new Runnable() {
|
||||
@@ -720,15 +723,24 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi
|
||||
panelTimingChunk = new JPanel();
|
||||
tabbedPane.addTab("Chunk Timing", null, panelTimingChunk, null);
|
||||
GridBagLayout gbl_panelTimingChunk = new GridBagLayout();
|
||||
gbl_panelTimingChunk.columnWidths = new int[]{649, 0};
|
||||
gbl_panelTimingChunk.columnWidths = new int[]{649, 649, 0};
|
||||
gbl_panelTimingChunk.rowHeights = new int[]{-15, 308, 0};
|
||||
gbl_panelTimingChunk.columnWeights = new double[]{1.0, Double.MIN_VALUE};
|
||||
gbl_panelTimingChunk.columnWeights = new double[]{1.0, 1.0, Double.MIN_VALUE};
|
||||
gbl_panelTimingChunk.rowWeights = new double[]{0.0, 1.0, Double.MIN_VALUE};
|
||||
panelTimingChunk.setLayout(gbl_panelTimingChunk);
|
||||
|
||||
btnTimingChunkTeleportToChunk = new JButton("Teleport");
|
||||
btnTimingChunkTeleportToChunk.addActionListener(this);
|
||||
GridBagConstraints gbc_btnTimingChunkTeleportToChunk = new GridBagConstraints();
|
||||
gbc_btnTimingChunkTeleportToChunk.anchor = GridBagConstraints.WEST;
|
||||
gbc_btnTimingChunkTeleportToChunk.insets = new Insets(0, 0, 5, 5);
|
||||
gbc_btnTimingChunkTeleportToChunk.gridx = 0;
|
||||
gbc_btnTimingChunkTeleportToChunk.gridy = 0;
|
||||
panelTimingChunk.add(btnTimingChunkTeleportToChunk, gbc_btnTimingChunkTeleportToChunk);
|
||||
|
||||
scrollPaneTimingChunk = new JScrollPane();
|
||||
GridBagConstraints gbc_scrollPaneTimingChunk = new GridBagConstraints();
|
||||
gbc_scrollPaneTimingChunk.insets = new Insets(0, 0, 5, 0);
|
||||
gbc_scrollPaneTimingChunk.gridwidth = 2;
|
||||
gbc_scrollPaneTimingChunk.fill = GridBagConstraints.BOTH;
|
||||
gbc_scrollPaneTimingChunk.gridx = 0;
|
||||
gbc_scrollPaneTimingChunk.gridy = 1;
|
||||
@@ -756,6 +768,8 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi
|
||||
|
||||
btnTimingChunkRefresh = new JButton("Run Opis");
|
||||
GridBagConstraints gbc_btnTimingChunkRefresh = new GridBagConstraints();
|
||||
gbc_btnTimingChunkRefresh.gridwidth = 2;
|
||||
gbc_btnTimingChunkRefresh.insets = new Insets(0, 0, 5, 0);
|
||||
gbc_btnTimingChunkRefresh.anchor = GridBagConstraints.EAST;
|
||||
gbc_btnTimingChunkRefresh.gridx = 0;
|
||||
gbc_btnTimingChunkRefresh.gridy = 0;
|
||||
@@ -920,6 +934,13 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.COMMAND_KILLALL, new SerialString(data.key)));
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST_AMOUNT_ENTITIES));
|
||||
}
|
||||
|
||||
else if ((e.getSource() == btnTimingChunkTeleportToChunk) && (tableTimingChunk.getSelectedRow() != -1)){
|
||||
int indexData = tableTimingChunk.convertRowIndexToModel(tableTimingChunk.getSelectedRow());
|
||||
StatsChunk data = DataCache.instance().getTimingChunks().get(indexData);
|
||||
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.COMMAND_TELEPORT_CHUNK, data.getChunk()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,6 +6,8 @@ import java.util.logging.Level;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar;
|
||||
@@ -36,7 +38,6 @@ import mcp.mobius.opis.network.server.Packet_DataList;
|
||||
import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataValue;
|
||||
import mcp.mobius.opis.network.server.Packet_LoadedChunks;
|
||||
import mcp.mobius.opis.network.server.Packet_MeanTime;
|
||||
import mcp.mobius.opis.network.server.Packet_Tickets;
|
||||
import mcp.mobius.opis.overlay.OverlayStatus;
|
||||
import mcp.mobius.opis.server.PlayerTracker;
|
||||
@@ -60,9 +61,8 @@ public class DataReqHandler {
|
||||
}
|
||||
|
||||
else if (maintype == DataReq.OVERLAY_CHUNK_TIMING){
|
||||
PlayerTracker.instance().playerOverlayStatus.put(player, OverlayStatus.MEANTIME);
|
||||
PlayerTracker.instance().playerDimension.put(player, ((SerialInt)param1).value);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_MeanTime.create(TileEntityManager.getTimes(((SerialInt)param1).value), ((SerialInt)param1).value), player);
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), (Player)player);
|
||||
}
|
||||
|
||||
else if (maintype == DataReq.LIST_CHUNK_TILEENTS){
|
||||
@@ -157,6 +157,17 @@ public class DataReqHandler {
|
||||
EntityManager.teleportEntity(EntityManager.getEntity(((TargetEntity)param1).entityID, ((TargetEntity)param1).dim), (EntityPlayerMP)player, player);
|
||||
}
|
||||
|
||||
else if (maintype == DataReq.COMMAND_TELEPORT_CHUNK){
|
||||
CoordinatesChunk chunkCoord = (CoordinatesChunk)param1;
|
||||
World world = DimensionManager.getWorld(chunkCoord.dim);
|
||||
if (world == null) return;
|
||||
|
||||
CoordinatesBlock blockCoord = new CoordinatesBlock(chunkCoord.dim, chunkCoord.x + 8, world.getTopSolidOrLiquidBlock(chunkCoord.x, chunkCoord.z), chunkCoord.z + 8);
|
||||
|
||||
EntityManager.teleportPlayer(blockCoord, (EntityPlayerMP)player);
|
||||
}
|
||||
|
||||
|
||||
else if (maintype == DataReq.COMMAND_KILLALL){
|
||||
EntityManager.killAll(((SerialString)param1).value);
|
||||
}
|
||||
|
||||
@@ -30,7 +30,6 @@ import mcp.mobius.opis.network.server.Packet_DataList;
|
||||
import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities;
|
||||
import mcp.mobius.opis.network.server.Packet_DataValue;
|
||||
import mcp.mobius.opis.network.server.Packet_LoadedChunks;
|
||||
import mcp.mobius.opis.network.server.Packet_MeanTime;
|
||||
import mcp.mobius.opis.network.server.Packet_ModMeanTime;
|
||||
import mcp.mobius.opis.network.server.Packet_TPS;
|
||||
import mcp.mobius.opis.network.server.Packet_Tickets;
|
||||
@@ -76,10 +75,12 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
ChunkManager.chunksLoad = castedPacket.chunkStatus;
|
||||
}
|
||||
|
||||
/*
|
||||
else if (header == Packets.MEANTIME){
|
||||
Packet_MeanTime castedPacket = new Packet_MeanTime(packet);
|
||||
ChunkManager.chunkMeanTime = castedPacket.chunkStatus;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
else if (header == Packets.TICKETS){
|
||||
Packet_Tickets castedPacket = new Packet_Tickets(packet);
|
||||
@@ -130,8 +131,10 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
else if (castedPacket.dataReq == DataReq.LIST_TIMING_HANDLERS)
|
||||
DataCache.instance().setTimingHandlers(castedPacket.data);
|
||||
|
||||
else if (castedPacket.dataReq == DataReq.LIST_TIMING_CHUNK)
|
||||
else if (castedPacket.dataReq == DataReq.LIST_TIMING_CHUNK){
|
||||
DataCache.instance().setTimingChunks(castedPacket.data);
|
||||
ChunkManager.setChunkMeanTime(castedPacket.data);
|
||||
}
|
||||
|
||||
else if (castedPacket.dataReq == DataReq.LIST_AMOUNT_ENTITIES)
|
||||
DataCache.instance().setAmountEntities(castedPacket.data);
|
||||
|
||||
@@ -6,7 +6,6 @@ public class Packets {
|
||||
public static byte REQ_CHUNKS = 0x02; // C => S //Not used right now
|
||||
public static byte TICKETS = 0x03; // S => C
|
||||
public static byte CHUNKS = 0x04; // S => C
|
||||
public static byte MEANTIME = 0x05; // S => C
|
||||
public static byte TPS = 0x06;
|
||||
public static byte MODMEANTIME = 0x07; // S => C
|
||||
public static byte CLIENT_CMD = 0x08;
|
||||
|
||||
@@ -30,6 +30,7 @@ public enum DataReq {
|
||||
VALUE_AMOUNT_DOWNLOAD,
|
||||
|
||||
COMMAND_TELEPORT_BLOCK(PRIVILEGED),
|
||||
COMMAND_TELEPORT_CHUNK(PRIVILEGED),
|
||||
COMMAND_TELEPORT_TO_ENTITY(PRIVILEGED),
|
||||
COMMAND_TELEPORT_PULL_ENTITY(PRIVILEGED),
|
||||
COMMAND_START(PRIVILEGED),
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
package mcp.mobius.opis.network.server;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
|
||||
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, StatsChunk> chunkStatus = new HashMap<CoordinatesChunk, StatsChunk>();
|
||||
|
||||
public Packet_MeanTime(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
this.chunkStatus.clear();
|
||||
|
||||
try{
|
||||
this.header = inputStream.readByte();
|
||||
int dim = inputStream.readInt();
|
||||
int nchunks = inputStream.readInt();
|
||||
|
||||
for (int i = 0; i <= nchunks; i++){
|
||||
CoordinatesChunk coord = new CoordinatesChunk(dim, inputStream.readInt(), inputStream.readInt());
|
||||
this.chunkStatus.put(coord, new StatsChunk(coord, inputStream.readInt(), inputStream.readInt(), inputStream.readDouble()));
|
||||
}
|
||||
|
||||
|
||||
} catch (IOException e){}
|
||||
}
|
||||
|
||||
public static Packet250CustomPayload create(HashMap<CoordinatesChunk, StatsChunk> chunks, int dim){
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.MEANTIME);
|
||||
outputStream.writeInt(dim);
|
||||
outputStream.writeInt(chunks.size());
|
||||
|
||||
for (CoordinatesChunk chunk : chunks.keySet()){
|
||||
outputStream.writeInt(chunk.chunkX);
|
||||
outputStream.writeInt(chunk.chunkZ);
|
||||
outputStream.writeInt(chunks.get(chunk).tileEntities);
|
||||
outputStream.writeInt(chunks.get(chunk).entities);
|
||||
outputStream.writeDouble(chunks.get(chunk).getDataSum());
|
||||
}
|
||||
|
||||
}catch(IOException e){}
|
||||
|
||||
packet.channel = "Opis";
|
||||
packet.data = bos.toByteArray();
|
||||
packet.length = bos.size();
|
||||
|
||||
return packet;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -144,16 +144,16 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
double minTime = 9999;
|
||||
double maxTime = 0;
|
||||
|
||||
for (CoordinatesChunk chunk : ChunkManager.chunkMeanTime.keySet()){
|
||||
minTime = Math.min(minTime, ChunkManager.chunkMeanTime.get(chunk).getDataSum());
|
||||
maxTime = Math.max(maxTime, ChunkManager.chunkMeanTime.get(chunk).getDataSum());
|
||||
for (CoordinatesChunk chunk : ChunkManager.getChunkMeanTime().keySet()){
|
||||
minTime = Math.min(minTime, ChunkManager.getChunkMeanTime().get(chunk).getDataSum());
|
||||
maxTime = Math.max(maxTime, ChunkManager.getChunkMeanTime().get(chunk).getDataSum());
|
||||
}
|
||||
|
||||
for (CoordinatesChunk chunk : ChunkManager.chunkMeanTime.keySet()){
|
||||
for (CoordinatesChunk chunk : ChunkManager.getChunkMeanTime().keySet()){
|
||||
if (this.selectedChunk != null)
|
||||
overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.chunkMeanTime.get(chunk).tileEntities, ChunkManager.chunkMeanTime.get(chunk).getDataSum(), minTime, maxTime, chunk.equals(this.selectedChunk)));
|
||||
overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.getChunkMeanTime().get(chunk).tileEntities, ChunkManager.getChunkMeanTime().get(chunk).getDataSum(), minTime, maxTime, chunk.equals(this.selectedChunk)));
|
||||
else
|
||||
overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.chunkMeanTime.get(chunk).tileEntities, ChunkManager.chunkMeanTime.get(chunk).getDataSum(), minTime, maxTime, false));
|
||||
overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunkManager.getChunkMeanTime().get(chunk).tileEntities, ChunkManager.getChunkMeanTime().get(chunk).getDataSum(), minTime, maxTime, false));
|
||||
}
|
||||
return overlays;
|
||||
}
|
||||
@@ -164,11 +164,11 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
int zChunk = bZ >> 4;
|
||||
CoordinatesChunk chunkCoord = new CoordinatesChunk(dim, xChunk, zChunk);
|
||||
|
||||
if (ChunkManager.chunkMeanTime.containsKey(chunkCoord))
|
||||
if (ChunkManager.getChunkMeanTime().containsKey(chunkCoord))
|
||||
if (modOpis.microseconds)
|
||||
return String.format("%.3f \u00B5s", ChunkManager.chunkMeanTime.get(chunkCoord).getDataSum());
|
||||
return String.format("%.3f \u00B5s", ChunkManager.getChunkMeanTime().get(chunkCoord).getDataSum());
|
||||
else
|
||||
return String.format(", %.5f ms", ChunkManager.chunkMeanTime.get(chunkCoord).getDataSum()/1000.0);
|
||||
return String.format(", %.5f ms", ChunkManager.getChunkMeanTime().get(chunkCoord).getDataSum()/1000.0);
|
||||
|
||||
else
|
||||
return "";
|
||||
@@ -182,7 +182,7 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
int chunkZ = bZ >> 4;
|
||||
CoordinatesChunk clickedChunk = new CoordinatesChunk(dim, chunkX, chunkZ);
|
||||
|
||||
if (ChunkManager.chunkMeanTime.containsKey(clickedChunk)){
|
||||
if (ChunkManager.getChunkMeanTime().containsKey(clickedChunk)){
|
||||
if (this.selectedChunk == null)
|
||||
this.selectedChunk = clickedChunk;
|
||||
else if (this.selectedChunk.equals(clickedChunk))
|
||||
|
||||
@@ -31,7 +31,6 @@ import mcp.mobius.opis.network.enums.DataReq;
|
||||
import mcp.mobius.opis.network.server.Packet_DataList;
|
||||
import mcp.mobius.opis.network.server.Packet_DataValue;
|
||||
import mcp.mobius.opis.network.server.Packet_LoadedChunks;
|
||||
import mcp.mobius.opis.network.server.Packet_MeanTime;
|
||||
import mcp.mobius.opis.overlay.OverlayStatus;
|
||||
import cpw.mods.fml.common.ITickHandler;
|
||||
import cpw.mods.fml.common.TickType;
|
||||
@@ -147,8 +146,10 @@ public class OpisServerTickHandler implements ITickHandler {
|
||||
for (Player player : PlayerTracker.instance().playerOverlayStatus.keySet()){
|
||||
if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.CHUNKSTATUS)
|
||||
PacketDispatcher.sendPacketToPlayer( Packet_LoadedChunks.create(ChunkManager.getLoadedChunks(PlayerTracker.instance().playerDimension.get(player))), player);
|
||||
if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.MEANTIME)
|
||||
PacketDispatcher.sendPacketToPlayer( Packet_MeanTime.create(TileEntityManager.getTimes(PlayerTracker.instance().playerDimension.get(player)), PlayerTracker.instance().playerDimension.get(player)), player);
|
||||
if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.MEANTIME){
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user