mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-20 12:19:50 +00:00
Done sending back chunk ent list on request.
This commit is contained in:
1 parent
1744742fee
commit
8ac018ecba
7 files changed
+112
-8
No files matched your search
@@ -96,6 +96,23 @@ public class EntityManager {
|
||||
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>();
|
||||
|
||||
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;}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -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<EntityStats> stats = new ArrayList<EntityStats>();
|
||||
|
||||
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<EntityStats> 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;
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user