diff --git a/mcp/mobius/opis/constants/OverlayStatus.java b/mcp/mobius/opis/constants/OverlayStatus.java deleted file mode 100644 index aed5381..0000000 --- a/mcp/mobius/opis/constants/OverlayStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package mcp.mobius.opis.constants; - -public enum OverlayStatus { - CHUNKSTATUS; -} diff --git a/mcp/mobius/opis/data/ChunkStatsData.java b/mcp/mobius/opis/data/ChunkStatsData.java new file mode 100644 index 0000000..91da16d --- /dev/null +++ b/mcp/mobius/opis/data/ChunkStatsData.java @@ -0,0 +1,13 @@ +package mcp.mobius.opis.data; + +public class ChunkStatsData { + public int nentities = 0; + public double updateTime = 0; + + public ChunkStatsData(){} + + public ChunkStatsData(int nentities, double updateTime){ + this.nentities = nentities; + this.updateTime = updateTime; + } +} diff --git a/mcp/mobius/opis/data/ChunkData.java b/mcp/mobius/opis/data/ChunksData.java similarity index 77% rename from mcp/mobius/opis/data/ChunkData.java rename to mcp/mobius/opis/data/ChunksData.java index a6e1e8f..2a6293d 100644 --- a/mcp/mobius/opis/data/ChunkData.java +++ b/mcp/mobius/opis/data/ChunksData.java @@ -7,14 +7,15 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.WorldServer; import net.minecraftforge.common.DimensionManager; -public class ChunkData { +public class ChunksData { - public static HashMap chunks = new HashMap(); + public static HashMap chunksLoad = new HashMap(); + public static HashMap chunkMeanTime = new HashMap(); public static HashMap> getAllLoadedChunks(){ HashMap> chunkStatus = new HashMap>(); for (int dim : DimensionManager.getIDs()) - chunkStatus.put(dim, ChunkData.getLoadedChunks(dim)); + chunkStatus.put(dim, ChunksData.getLoadedChunks(dim)); return chunkStatus; } diff --git a/mcp/mobius/opis/data/Coordinates.java b/mcp/mobius/opis/data/Coordinates.java deleted file mode 100644 index 67c437e..0000000 --- a/mcp/mobius/opis/data/Coordinates.java +++ /dev/null @@ -1,42 +0,0 @@ -package mcp.mobius.opis.data; - -public final class Coordinates { - public final int dim, x, y, z; - public final int chunkX, chunkZ; - public boolean isChunk; - - public Coordinates(int dim, int x, int y, int z){ - this.dim = dim; - this.x = x; - this.y = y; - this.z = z; - this.chunkX = x >> 4; - this.chunkZ = z >> 4; - this.isChunk = false; - } - - public Coordinates(int dim, int chunkX, int chunkZ){ - this.dim = dim; - this.chunkX = chunkX; - this.chunkZ = chunkZ; - this.x = chunkX << 4; - this.y = 0; - this.z = chunkZ << 4; - this.isChunk = true; - } - - public boolean equals(Object o) { - Coordinates c = (Coordinates)o; - if (this.isChunk) - return (this.dim == c.dim) && (this.chunkX == c.chunkX) && (this.chunkZ == c.chunkZ); - else - return (this.dim == c.dim) && (this.x == c.x) && (this.y == c.y) && (this.z == c.z); - }; - - public int hashCode() { - if (this.isChunk) - return String.format("%s %s %s", this.dim, this.chunkX, this.chunkZ).hashCode(); - else - return String.format("%s %s %s %s", this.dim, this.x, this.y, this.z).hashCode(); - }; -} diff --git a/mcp/mobius/opis/data/CoordinatesBlock.java b/mcp/mobius/opis/data/CoordinatesBlock.java new file mode 100644 index 0000000..dd0e564 --- /dev/null +++ b/mcp/mobius/opis/data/CoordinatesBlock.java @@ -0,0 +1,73 @@ +package mcp.mobius.opis.data; + +import net.minecraft.tileentity.TileEntity; + +public final class CoordinatesBlock { + public final int dim, x, y, z; + public final int chunkX, chunkZ; + //public boolean isChunk; + + public CoordinatesBlock(int dim, int x, int y, int z){ + this.dim = dim; + this.x = x; + this.y = y; + this.z = z; + this.chunkX = x >> 4; + this.chunkZ = z >> 4; + //this.isChunk = false; + } + + public CoordinatesBlock(CoordinatesChunk coord){ + this.dim = coord.dim; + this.chunkX = coord.chunkX; + this.chunkZ = coord.chunkZ; + + this.x = coord.x; + this.y = coord.y; + this.z = coord.z; + } + + /* + public CoordinatesBlock(int dim, int chunkX, int chunkZ){ + this.dim = dim; + this.chunkX = chunkX; + this.chunkZ = chunkZ; + this.x = chunkX << 4; + this.y = 0; + this.z = chunkZ << 4; + this.isChunk = true; + } + */ + + public CoordinatesBlock(TileEntity te){ + this.dim = te.getWorldObj().provider.dimensionId; + this.x = te.xCoord; + this.y = te.yCoord; + this.z = te.zCoord; + this.chunkX = x >> 4; + this.chunkZ = z >> 4; + //this.isChunk = false; + } + + public String toString(){ + //if (this.isChunk) + // return String.format("[%6d %6d %6d]", this.dim, this.chunkX, this.chunkZ); + //else + return String.format("[%6d %6d %6d %6d]", this.dim, this.x, this.y, this.z); + } + + public boolean equals(Object o) { + CoordinatesBlock c = (CoordinatesBlock)o; + //if (this.isChunk) + // return (this.dim == c.dim) && (this.chunkX == c.chunkX) && (this.chunkZ == c.chunkZ); + //else + return (this.dim == c.dim) && (this.x == c.x) && (this.y == c.y) && (this.z == c.z); + }; + + public int hashCode() { + //if (this.isChunk) + // return String.format("%s %s %s", this.dim, this.chunkX, this.chunkZ).hashCode(); + //else + return String.format("%s %s %s %s", this.dim, this.x, this.y, this.z).hashCode(); + }; +} diff --git a/mcp/mobius/opis/data/CoordinatesChunk.java b/mcp/mobius/opis/data/CoordinatesChunk.java new file mode 100644 index 0000000..60c0f87 --- /dev/null +++ b/mcp/mobius/opis/data/CoordinatesChunk.java @@ -0,0 +1,52 @@ +package mcp.mobius.opis.data; + +import net.minecraft.tileentity.TileEntity; + +public final class CoordinatesChunk { + public final int dim, x, y, z; + public final int chunkX, chunkZ; + //public boolean isChunk; + + public CoordinatesChunk(CoordinatesBlock coord){ + this.dim = coord.dim; + this.chunkX = coord.chunkX; + this.chunkZ = coord.chunkZ; + + this.x = chunkX << 4; + this.y = 0; + this.z = chunkZ << 4; + } + + public CoordinatesChunk(int dim, int chunkX, int chunkZ){ + this.dim = dim; + this.chunkX = chunkX; + this.chunkZ = chunkZ; + + this.x = chunkX << 4; + this.y = 0; + this.z = chunkZ << 4; + } + + public CoordinatesChunk(TileEntity te){ + this.dim = te.getWorldObj().provider.dimensionId; + this.chunkX = te.xCoord >> 4; + this.chunkZ = te.zCoord >> 4; + + this.x = this.chunkX << 4; + this.y = 0; + this.z = this.chunkZ << 4; + } + + public String toString(){ + return String.format("[%6d %6d %6d]", this.dim, this.chunkX, this.chunkZ); + } + + public boolean equals(Object o) { + CoordinatesChunk c = (CoordinatesChunk)o; + return (this.dim == c.dim) && (this.chunkX == c.chunkX) && (this.chunkZ == c.chunkZ); + } + + public int hashCode() { + return String.format("%s %s %s", this.dim, this.chunkX, this.chunkZ).hashCode(); + } +} diff --git a/mcp/mobius/opis/data/ProfilerTileEntities.java b/mcp/mobius/opis/data/ProfilerTileEntities.java index 829b2bd..c053e1f 100644 --- a/mcp/mobius/opis/data/ProfilerTileEntities.java +++ b/mcp/mobius/opis/data/ProfilerTileEntities.java @@ -5,6 +5,16 @@ import mcp.mobius.mobiuscore.profiler.IProfilerTileEntity; public class ProfilerTileEntities implements IProfilerTileEntity { + public class Clock{ + public long startTime = 0; + public long timeDelta = 0; + public void start(){this.startTime = System.nanoTime();} + public void stop(){this.timeDelta = System.nanoTime() - this.startTime;} + } + + private TileEntity currentEntity = null; + private Clock clock = new Clock(); + @Override public void GlobalStart() { } @@ -12,10 +22,24 @@ public class ProfilerTileEntities implements IProfilerTileEntity { public void GlobalStop() { } @Override - public void Start(TileEntity te) { } + public void Start(TileEntity te) { + if (te.worldObj.isRemote) return; + + this.currentEntity = te; + this.clock.start(); + } @Override - public void Stop(TileEntity te) { } + public void Stop(TileEntity te) { + this.clock.stop(); + if (te.worldObj.isRemote) return; + + if (te != this.currentEntity) + throw new RuntimeException(String.format("Mismatched entities during the profiling ! %s %s", te, this.currentEntity)); + + TileEntitiesData.addTileEntity(te, this.clock.timeDelta); + this.currentEntity = null; + } } diff --git a/mcp/mobius/opis/data/TileEntitiesData.java b/mcp/mobius/opis/data/TileEntitiesData.java new file mode 100644 index 0000000..14e356a --- /dev/null +++ b/mcp/mobius/opis/data/TileEntitiesData.java @@ -0,0 +1,47 @@ +package mcp.mobius.opis.data; + +import java.util.HashMap; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntitiesData { + public static HashMap references = new HashMap(); + public static HashMap stats = new HashMap(); + + public static void addTileEntity(TileEntity te, long timing){ + CoordinatesBlock coord = new CoordinatesBlock(te); + if (references.containsKey(coord) && references.get(coord) != te.getClass()){ + references.remove(coord); + stats.remove(coord); + } + + if (!(references.containsKey(coord))){ + references.put(coord, te.getClass()); + stats.put(coord, new TileEntityStatsData()); + } + + stats.get(coord).addMeasure(timing); + } + + public static HashMap getTimes(int dim){ + + HashMap chunks = new HashMap(); + + for (CoordinatesBlock coord : TileEntitiesData.stats.keySet()){ + if (coord.dim == dim){ + + CoordinatesChunk coordC = new CoordinatesChunk(coord); + if (!(chunks.containsKey(coordC))) + chunks.put(coordC, new ChunkStatsData()); + + chunks.get(coordC).nentities += 1; + chunks.get(coordC).updateTime += stats.get(coord).getGeometricMean(); + + } + } + + return chunks; + } + + +} diff --git a/mcp/mobius/opis/data/TileEntityStatsData.java b/mcp/mobius/opis/data/TileEntityStatsData.java new file mode 100644 index 0000000..cbf45f3 --- /dev/null +++ b/mcp/mobius/opis/data/TileEntityStatsData.java @@ -0,0 +1,16 @@ +package mcp.mobius.opis.data; + +import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; + +public class TileEntityStatsData { + + private DescriptiveStatistics stats = new DescriptiveStatistics(250); + + public void addMeasure(long timing){ + stats.addValue(timing/1000.0); + } + + public double getGeometricMean(){ + return stats.getGeometricMean(); + } +} diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index 67461e4..baefd02 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -2,7 +2,9 @@ package mcp.mobius.opis; import java.util.logging.Logger; +import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.commands.CommandChunkDump; +import mcp.mobius.opis.data.ProfilerTileEntities; import mcp.mobius.opis.network.OpisConnectionHandler; import mcp.mobius.opis.network.OpisPacketHandler; import mcp.mobius.opis.proxy.ProxyServer; @@ -52,5 +54,6 @@ public class modOpis { public void serverStarting(FMLServerStartingEvent event){ event.registerServerCommand(new CommandChunkDump()); GameRegistry.registerPlayerTracker(new OpisPlayerTracker()); + ProfilerRegistrar.registerTileEntityProfiler(new ProfilerTileEntities()); } } diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index ed9abc5..462eec4 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -8,9 +8,10 @@ import java.util.Set; import java.util.logging.Level; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.constants.OverlayStatus; -import mcp.mobius.opis.data.ChunkData; +import mcp.mobius.opis.data.ChunksData; +import mcp.mobius.opis.data.TileEntitiesData; import mcp.mobius.opis.overlay.OverlayLoadedChunks; +import mcp.mobius.opis.overlay.OverlayStatus; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.world.ChunkCoordIntPair; @@ -28,14 +29,14 @@ public class OpisPacketHandler implements IPacketHandler { byte header = this.getHeader(packet); if (header == Packets.LOADED_CHUNKS){ Packet_LoadedChunks castedPacket = new Packet_LoadedChunks(packet); - ChunkData.chunks = castedPacket.chunkStatus; + ChunksData.chunksLoad = castedPacket.chunkStatus; } else if (header == Packets.REQ_CHUNKS_IN_DIM){ Packet_ReqChunksInDim castedPacket = new Packet_ReqChunksInDim(packet); modOpis.proxy.playerOverlayStatus.put(player, OverlayStatus.CHUNKSTATUS); modOpis.proxy.playerDimension.put(player, castedPacket.dimension); - PacketDispatcher.sendPacketToPlayer(Packet_LoadedChunks.create(ChunkData.getLoadedChunks(castedPacket.dimension)), player); + PacketDispatcher.sendPacketToPlayer(Packet_LoadedChunks.create(ChunksData.getLoadedChunks(castedPacket.dimension)), player); } else if (header == Packets.UNREGISTER_USER){ @@ -48,6 +49,18 @@ public class OpisPacketHandler implements IPacketHandler { Packet_ReqChunksAll castedPacket = new Packet_ReqChunksAll(packet); } + else if (header == Packets.REQ_MEANTIME_IN_DIM){ + Packet_ReqMeanTimeInDim castedPacket = new Packet_ReqMeanTimeInDim(packet); + modOpis.proxy.playerOverlayStatus.put(player, OverlayStatus.MEANTIME); + modOpis.proxy.playerDimension.put(player, castedPacket.dimension); + PacketDispatcher.sendPacketToPlayer(Packet_MeanTime.create(TileEntitiesData.getTimes(castedPacket.dimension), castedPacket.dimension), player); + } + + else if (header == Packets.MEANTIME){ + Packet_MeanTime castedPacket = new Packet_MeanTime(packet); + ChunksData.chunkMeanTime = castedPacket.chunkStatus; + } + } } diff --git a/mcp/mobius/opis/network/Packet_MeanTime.java b/mcp/mobius/opis/network/Packet_MeanTime.java new file mode 100644 index 0000000..2e0b3ae --- /dev/null +++ b/mcp/mobius/opis/network/Packet_MeanTime.java @@ -0,0 +1,63 @@ +package mcp.mobius.opis.network; + +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.ChunkStatsData; +import mcp.mobius.opis.data.CoordinatesChunk; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.world.ChunkCoordIntPair; + +public class Packet_MeanTime { + + public byte header; + public HashMap chunkStatus = new HashMap(); + + 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++){ + this.chunkStatus.put(new CoordinatesChunk(dim, inputStream.readInt(), inputStream.readInt()), new ChunkStatsData(inputStream.readInt(), inputStream.readDouble())); + } + + + } catch (IOException e){} + } + + public static Packet250CustomPayload create(HashMap 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).nentities); + outputStream.writeDouble(chunks.get(chunk).updateTime); + } + + }catch(IOException e){} + + packet.channel = "Opis"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } + +} diff --git a/mcp/mobius/opis/network/Packet_ReqMeanTimeInDim.java b/mcp/mobius/opis/network/Packet_ReqMeanTimeInDim.java new file mode 100644 index 0000000..0803e10 --- /dev/null +++ b/mcp/mobius/opis/network/Packet_ReqMeanTimeInDim.java @@ -0,0 +1,42 @@ +package mcp.mobius.opis.network; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import net.minecraft.network.packet.Packet250CustomPayload; + +public class Packet_ReqMeanTimeInDim { + + public byte header; + public int dimension; + + public Packet_ReqMeanTimeInDim(Packet250CustomPayload packet) { + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + + try{ + this.header = inputStream.readByte(); + this.dimension = inputStream.readInt(); + } catch (IOException e){} + } + + public static Packet250CustomPayload create(int dimension){ + Packet250CustomPayload packet = new Packet250CustomPayload(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(1); + DataOutputStream outputStream = new DataOutputStream(bos); + + try{ + outputStream.writeByte(Packets.REQ_MEANTIME_IN_DIM); + outputStream.writeInt(dimension); + }catch(IOException e){} + + packet.channel = "Opis"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } + +} diff --git a/mcp/mobius/opis/network/Packets.java b/mcp/mobius/opis/network/Packets.java index ece5256..cdf4e9b 100644 --- a/mcp/mobius/opis/network/Packets.java +++ b/mcp/mobius/opis/network/Packets.java @@ -1,10 +1,16 @@ package mcp.mobius.opis.network; public class Packets { - public static byte LOADED_CHUNKS = 0x01; // S => C - public static byte REQ_CHUNKS_IN_DIM = 0x02; // C => S - public static byte REQ_CHUNKS_ALL = 0x03; // C => S //Not used right now + public static byte UNREGISTER_USER = 0x00; // C => S - public static byte UNREGISTER_USER = 0x04; // C => S + public static byte LOADED_CHUNKS = 0x01; // S => C + public static byte REQ_CHUNKS_IN_DIM = 0x02; // C => S + public static byte REQ_CHUNKS_ALL = 0x03; // C => S //Not used right now + + public static byte MEANTIME = 0x10; // S => C + public static byte REQ_MEANTIME_IN_DIM = 0x11; // C => S + public static byte REQ_MEANTIME_ALL = 0x12; // C => S //Not used right now + + } diff --git a/mcp/mobius/opis/overlay/OverlayLoadedChunks.java b/mcp/mobius/opis/overlay/OverlayLoadedChunks.java index 8c33508..6d70586 100644 --- a/mcp/mobius/opis/overlay/OverlayLoadedChunks.java +++ b/mcp/mobius/opis/overlay/OverlayLoadedChunks.java @@ -9,7 +9,7 @@ import net.minecraft.world.ChunkCoordIntPair; import mapwriter.api.IMwChunkOverlay; import mapwriter.api.IMwDataProvider; import mapwriter.map.MapView; -import mcp.mobius.opis.data.ChunkData; +import mcp.mobius.opis.data.ChunksData; import mcp.mobius.opis.network.Packet_ReqChunksInDim; import mcp.mobius.opis.network.Packet_UnregisterPlayer; @@ -51,8 +51,8 @@ public class OverlayLoadedChunks implements IMwDataProvider { @Override public ArrayList getChunksOverlay(int dim, double centerX, double centerZ, double minX, double minZ, double maxX, double maxZ) { ArrayList overlays = new ArrayList(); - for (ChunkCoordIntPair chunk : ChunkData.chunks.keySet()) - overlays.add(new ChunkOverlay(chunk.chunkXPos, chunk.chunkZPos, ChunkData.chunks.get(chunk))); + for (ChunkCoordIntPair chunk : ChunksData.chunksLoad.keySet()) + overlays.add(new ChunkOverlay(chunk.chunkXPos, chunk.chunkZPos, ChunksData.chunksLoad.get(chunk))); return overlays; } @@ -62,8 +62,8 @@ public class OverlayLoadedChunks implements IMwDataProvider { int zChunk = bZ >> 4; ChunkCoordIntPair chunkCoord = new ChunkCoordIntPair(xChunk, zChunk); - if (ChunkData.chunks.containsKey(chunkCoord)){ - if (ChunkData.chunks.get(chunkCoord)) + if (ChunksData.chunksLoad.containsKey(chunkCoord)){ + if (ChunksData.chunksLoad.get(chunkCoord)) return ", Force loaded"; else return ", Player loaded"; diff --git a/mcp/mobius/opis/overlay/OverlayMeanTime.java b/mcp/mobius/opis/overlay/OverlayMeanTime.java new file mode 100644 index 0000000..9199e79 --- /dev/null +++ b/mcp/mobius/opis/overlay/OverlayMeanTime.java @@ -0,0 +1,96 @@ +package mcp.mobius.opis.overlay; + +import java.awt.Point; +import java.util.ArrayList; + +import cpw.mods.fml.common.network.PacketDispatcher; +import mapwriter.api.IMwChunkOverlay; +import mapwriter.api.IMwDataProvider; +import mapwriter.map.MapView; +import mcp.mobius.opis.data.ChunksData; +import mcp.mobius.opis.data.CoordinatesChunk; +import mcp.mobius.opis.network.Packet_ReqMeanTimeInDim; +import mcp.mobius.opis.network.Packet_UnregisterPlayer; + +public class OverlayMeanTime implements IMwDataProvider { + + public class ChunkOverlay implements IMwChunkOverlay{ + + Point coord; + int nentities; + double time; + + public ChunkOverlay(int x, int z, int nentities, double time){ + this.coord = new Point(x, z); + this.nentities = nentities; + this.time = time; + } + + @Override + public Point getCoordinates() { return this.coord; } + + @Override + public int getColor() { return 0x5000ff00; } + + @Override + public float getFilling() { return 1.0f; } + + @Override + public boolean hasBorder() { return true; } + + @Override + public float getBorderWidth() { return 0.5f; } + + @Override + public int getBorderColor() { return 0xff000000; } + + } + + @Override + public ArrayList getChunksOverlay(int dim, double centerX, double centerZ, double minX, double minZ, double maxX, double maxZ) { + ArrayList overlays = new ArrayList(); + for (CoordinatesChunk chunk : ChunksData.chunkMeanTime.keySet()) + overlays.add(new ChunkOverlay(chunk.chunkX, chunk.chunkZ, ChunksData.chunkMeanTime.get(chunk).nentities, ChunksData.chunkMeanTime.get(chunk).updateTime)); + return overlays; + } + + @Override + public String getStatusString(int dim, int bX, int bY, int bZ) { + int xChunk = bX >> 4; + int zChunk = bZ >> 4; + CoordinatesChunk chunkCoord = new CoordinatesChunk(dim, xChunk, zChunk); + + if (ChunksData.chunkMeanTime.containsKey(chunkCoord)) + return String.format(", %.5f ms", ChunksData.chunkMeanTime.get(chunkCoord).updateTime/1000.0); + else + return ""; + } + + @Override + public void onMiddleClick(int dim, int bX, int bZ, MapView mapview) { + } + + @Override + public void onDimensionChanged(int dimension, MapView mapview) { + PacketDispatcher.sendPacketToServer(Packet_ReqMeanTimeInDim.create(dimension)); + } + + @Override + public void onMapCenterChanged(double vX, double vZ, MapView mapview) { + } + + @Override + public void onZoomChanged(int level, MapView mapview) { + } + + @Override + public void onOverlayActivated(MapView mapview) { + PacketDispatcher.sendPacketToServer(Packet_ReqMeanTimeInDim.create(mapview.getDimension())); + } + + @Override + public void onOverlayDeactivated(MapView mapview) { + PacketDispatcher.sendPacketToServer(Packet_UnregisterPlayer.create()); + } + +} diff --git a/mcp/mobius/opis/overlay/OverlayStatus.java b/mcp/mobius/opis/overlay/OverlayStatus.java new file mode 100644 index 0000000..3e76f5e --- /dev/null +++ b/mcp/mobius/opis/overlay/OverlayStatus.java @@ -0,0 +1,6 @@ +package mcp.mobius.opis.overlay; + +public enum OverlayStatus { + CHUNKSTATUS, + MEANTIME; +} diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index c62cdd3..5cfd695 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -2,6 +2,7 @@ package mcp.mobius.opis.proxy; import mapwriter.api.MwAPI; import mcp.mobius.opis.overlay.OverlayLoadedChunks; +import mcp.mobius.opis.overlay.OverlayMeanTime; public class ProxyClient extends ProxyServer { @@ -9,5 +10,6 @@ public class ProxyClient extends ProxyServer { public void init(){ //MwAPI.registerDataProvider("Loaded chunks", OverlayLoadedChunks.instance); MwAPI.registerDataProvider("Loaded chunks", new OverlayLoadedChunks()); + MwAPI.registerDataProvider("Mean time", new OverlayMeanTime()); } } diff --git a/mcp/mobius/opis/proxy/ProxyServer.java b/mcp/mobius/opis/proxy/ProxyServer.java index 79e271a..ed5d29e 100644 --- a/mcp/mobius/opis/proxy/ProxyServer.java +++ b/mcp/mobius/opis/proxy/ProxyServer.java @@ -3,7 +3,9 @@ package mcp.mobius.opis.proxy; import java.util.HashMap; import cpw.mods.fml.common.network.Player; -import mcp.mobius.opis.constants.OverlayStatus; +import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; +import mcp.mobius.opis.data.ProfilerTileEntities; +import mcp.mobius.opis.overlay.OverlayStatus; public class ProxyServer { public HashMap playerOverlayStatus = new HashMap(); diff --git a/mcp/mobius/opis/server/OpisServerTickHandler.java b/mcp/mobius/opis/server/OpisServerTickHandler.java index 43642ba..0500ad5 100644 --- a/mcp/mobius/opis/server/OpisServerTickHandler.java +++ b/mcp/mobius/opis/server/OpisServerTickHandler.java @@ -4,9 +4,11 @@ import java.util.EnumSet; import java.util.logging.Level; import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.constants.OverlayStatus; -import mcp.mobius.opis.data.ChunkData; +import mcp.mobius.opis.data.ChunksData; +import mcp.mobius.opis.data.TileEntitiesData; import mcp.mobius.opis.network.Packet_LoadedChunks; +import mcp.mobius.opis.network.Packet_MeanTime; +import mcp.mobius.opis.overlay.OverlayStatus; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.network.PacketDispatcher; @@ -42,9 +44,12 @@ public class OpisServerTickHandler implements ITickHandler { } private void updatePlayers(){ - for (Player player : modOpis.proxy.playerOverlayStatus.keySet()) + for (Player player : modOpis.proxy.playerOverlayStatus.keySet()){ if (modOpis.proxy.playerOverlayStatus.get(player) == OverlayStatus.CHUNKSTATUS) - PacketDispatcher.sendPacketToPlayer( Packet_LoadedChunks.create(ChunkData.getLoadedChunks(modOpis.proxy.playerDimension.get(player))), player); + PacketDispatcher.sendPacketToPlayer( Packet_LoadedChunks.create(ChunksData.getLoadedChunks(modOpis.proxy.playerDimension.get(player))), player); + if (modOpis.proxy.playerOverlayStatus.get(player) == OverlayStatus.MEANTIME) + PacketDispatcher.sendPacketToPlayer( Packet_MeanTime.create(TileEntitiesData.getTimes(modOpis.proxy.playerDimension.get(player)), modOpis.proxy.playerDimension.get(player)), player); + } } }