From 8ac018ecbac376b96e7922b0eeabb30e724401d5 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Fri, 6 Dec 2013 03:19:59 +0100 Subject: [PATCH] Done sending back chunk ent list on request. --- mcp/mobius/opis/data/EntityManager.java | 17 ++++++ mcp/mobius/opis/data/holders/EntityStats.java | 20 ++++++- mcp/mobius/opis/network/DataReqHandler.java | 14 ++++- .../opis/network/OpisPacketHandler.java | 9 ++++ mcp/mobius/opis/network/Packets.java | 3 +- .../server/Packet_DataListChunkEntities.java | 54 +++++++++++++++++++ .../entperchunk/OverlayEntityPerChunk.java | 3 -- 7 files changed, 112 insertions(+), 8 deletions(-) create mode 100644 mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java diff --git a/mcp/mobius/opis/data/EntityManager.java b/mcp/mobius/opis/data/EntityManager.java index 8aa400e..2f60075 100644 --- a/mcp/mobius/opis/data/EntityManager.java +++ b/mcp/mobius/opis/data/EntityManager.java @@ -96,6 +96,23 @@ public class EntityManager { return entities; } + /* Returns an array of all entities in a given chunk */ + public static ArrayList getEntitiesInChunk(CoordinatesChunk coord){ + ArrayList entities = new ArrayList(); + + World world = DimensionManager.getWorld(coord.dim); + if (world == null) return entities; + + for (int i = 0; i < world.loadedEntityList.size(); i++){ + Entity ent = (Entity)world.loadedEntityList.get(i); + 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)); + } + + return entities; + } + public static CoordinatesBlock getTeleportTarget(CoordinatesBlock coord){ World world = DimensionManager.getWorld(coord.dim); if (world == null) {return null;} diff --git a/mcp/mobius/opis/data/holders/EntityStats.java b/mcp/mobius/opis/data/holders/EntityStats.java index b3073a6..62c5e48 100644 --- a/mcp/mobius/opis/data/holders/EntityStats.java +++ b/mcp/mobius/opis/data/holders/EntityStats.java @@ -4,6 +4,8 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import net.minecraft.network.packet.Packet; + import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import mcp.mobius.opis.modOpis; @@ -31,6 +33,10 @@ public class EntityStats implements ISerializable, Comparable { dstat.addValue((double)timing/1000.0); } + public void setGeometricMean(double value){ + this.geomMean = value; + } + public String getName(){ return this.name; }; public double getGeometricMean(){ @@ -71,10 +77,20 @@ public class EntityStats implements ISerializable, Comparable { @Override public void writeToStream(DataOutputStream stream) throws IOException{ + 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()); } - public static TileEntityStats readFromStream(DataInputStream stream) throws IOException { - return null; + public static EntityStats readFromStream(DataInputStream stream) throws IOException { + EntityStats stats = new EntityStats(stream.readInt(), Packet.readString(stream, 255), stream.readInt(), + stream.readDouble(), stream.readDouble(), stream.readDouble()); + stats.setGeometricMean(stream.readDouble()); + return stats; } } diff --git a/mcp/mobius/opis/network/DataReqHandler.java b/mcp/mobius/opis/network/DataReqHandler.java index 733aafd..8030d6e 100644 --- a/mcp/mobius/opis/network/DataReqHandler.java +++ b/mcp/mobius/opis/network/DataReqHandler.java @@ -10,6 +10,7 @@ import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.EntityManager; import mcp.mobius.opis.data.holders.CoordinatesChunk; import mcp.mobius.opis.data.holders.EntityStats; +import mcp.mobius.opis.network.server.Packet_DataListChunkEntities; import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities; public class DataReqHandler { @@ -22,7 +23,7 @@ public class DataReqHandler { _instance = new DataReqHandler(); return _instance; } - + public void handle(CoordinatesChunk coord, String datatype, Player player){ String[] data = datatype.split(":"); @@ -34,7 +35,16 @@ public class DataReqHandler { } } } - + else if (data[0].equals("list")){ + if (data[1].equals("chunk")){ + if (data[2].equals("entities")){ + PacketDispatcher.sendPacketToPlayer(Packet_DataListChunkEntities.create(EntityManager.getEntitiesInChunk(coord)), player); + return; + } + } + } + + modOpis.log.log(Level.WARNING, String.format("Unknown data request : %s", datatype)); } diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index c0612e3..683a167 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -11,6 +11,7 @@ import mcp.mobius.opis.data.ChunkManager; import mcp.mobius.opis.data.EntityManager; import mcp.mobius.opis.data.TileEntityManager; 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.network.client.Packet_ReqChunks; import mcp.mobius.opis.network.client.Packet_ReqChunksInDim; @@ -22,6 +23,7 @@ import mcp.mobius.opis.network.client.Packet_ReqTickets; import mcp.mobius.opis.network.client.Packet_UnregisterPlayer; import mcp.mobius.opis.network.server.Packet_ChunkTopList; import mcp.mobius.opis.network.server.Packet_Chunks; +import mcp.mobius.opis.network.server.Packet_DataListChunkEntities; import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities; import mcp.mobius.opis.network.server.Packet_LoadedChunks; import mcp.mobius.opis.network.server.Packet_MeanTime; @@ -121,6 +123,13 @@ public class OpisPacketHandler implements IPacketHandler { OverlayEntityPerChunk.instance().reduceData(); OverlayEntityPerChunk.instance().setupChunkTable(); } + + else if (header == Packets.DATA_LIST_CHUNK_ENTITIES){ + Packet_DataListChunkEntities castedPacket = new Packet_DataListChunkEntities(packet); + for (EntityStats entity : castedPacket.stats) + System.out.printf("%s\n", entity); + } + } void onPacketToServer(INetworkManager manager, Packet250CustomPayload packet, Player player, Byte header) { diff --git a/mcp/mobius/opis/network/Packets.java b/mcp/mobius/opis/network/Packets.java index afe4c5f..ca93796 100644 --- a/mcp/mobius/opis/network/Packets.java +++ b/mcp/mobius/opis/network/Packets.java @@ -25,7 +25,8 @@ public class Packets { public static byte REQ_TELEPORT = 0x30; // C => S - public static byte DATA_OVERLAY_CHUNK_ENTITIES = 0x40; + public static byte DATA_OVERLAY_CHUNK_ENTITIES = 0x40; + public static byte DATA_LIST_CHUNK_ENTITIES = 0x41; public static byte REQ_DATA = 0x50; // C => S } diff --git a/mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java b/mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java new file mode 100644 index 0000000..22b12e9 --- /dev/null +++ b/mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java @@ -0,0 +1,54 @@ +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.ArrayList; + +import net.minecraft.network.packet.Packet250CustomPayload; +import mcp.mobius.opis.data.holders.EntityStats; +import mcp.mobius.opis.network.Packet251Extended; +import mcp.mobius.opis.network.Packets; + +public class Packet_DataListChunkEntities { + public byte header; + public ArrayList stats = new ArrayList(); + + public Packet_DataListChunkEntities(Packet250CustomPayload packet) { + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + this.stats.clear(); + + try{ + this.header = inputStream.readByte(); + int nents = inputStream.readInt(); + + for (int i = 0; i <= nents; i++){ + EntityStats stat = EntityStats.readFromStream(inputStream); + this.stats.add(stat); + } + } catch (IOException e){} + } + + public static Packet250CustomPayload create(ArrayList entities){ + Packet251Extended packet = new Packet251Extended(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(1); + DataOutputStream outputStream = new DataOutputStream(bos); + + try{ + outputStream.writeByte(Packets.DATA_LIST_CHUNK_ENTITIES); + outputStream.writeInt(entities.size()); + for (EntityStats stat : entities){ + stat.writeToStream(outputStream); + } + + }catch(IOException e){} + + packet.channel = "Opis"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } +} diff --git a/mcp/mobius/opis/overlay/entperchunk/OverlayEntityPerChunk.java b/mcp/mobius/opis/overlay/entperchunk/OverlayEntityPerChunk.java index 59eb74f..680e07c 100644 --- a/mcp/mobius/opis/overlay/entperchunk/OverlayEntityPerChunk.java +++ b/mcp/mobius/opis/overlay/entperchunk/OverlayEntityPerChunk.java @@ -68,9 +68,6 @@ public class OverlayEntityPerChunk implements IMwDataProvider { for (CoordinatesChunk chunk : this.overlayData.keySet()) this.reducedData.add(new ReducedData(chunk, this.overlayData.get(chunk))); Collections.sort(this.reducedData); - - for (ReducedData data : this.reducedData) - System.out.printf("%s %s\n", data.chunk, data.amount); } @Override