diff --git a/mcp/mobius/opis/network/DataReqHandler.java b/mcp/mobius/opis/network/DataReqHandler.java index 8a915f9..5e783d8 100644 --- a/mcp/mobius/opis/network/DataReqHandler.java +++ b/mcp/mobius/opis/network/DataReqHandler.java @@ -21,7 +21,6 @@ import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataList; -import mcp.mobius.opis.network.server.Packet_DataListChunkEntities; import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities; import mcp.mobius.opis.server.PlayerTracker; @@ -48,10 +47,9 @@ public class DataReqHandler { } } else if (maintype == DataReq.LIST){ - if (subtype == DataReq.CHUNK){ if (target == DataReq.ENTITIES){ - PacketDispatcher.sendPacketToPlayer(Packet_DataListChunkEntities.create(EntityManager.getEntitiesInChunk(coord)), player); + PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.CHUNK, DataReq.ENTITIES, EntityManager.getEntitiesInChunk(coord)), (Player)player); return; } } diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 99e229c..6f9c5d4 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -29,7 +29,6 @@ import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_Chunks; import mcp.mobius.opis.network.server.Packet_ClientCommand; import mcp.mobius.opis.network.server.Packet_DataList; -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; @@ -120,12 +119,6 @@ public class OpisPacketHandler implements IPacketHandler { OverlayEntityPerChunk.instance().setupChunkTable(); } - else if (header == Packets.DATA_LIST_CHUNK_ENTITIES){ - Packet_DataListChunkEntities castedPacket = new Packet_DataListChunkEntities(packet); - OverlayEntityPerChunk.instance().entStats = castedPacket.stats; - OverlayEntityPerChunk.instance().setupEntTable(); - } - else if (header == Packets.CLIENT_CMD){ Packet_ClientCommand castedPacket = new Packet_ClientCommand(packet); ClientCommandHandler.instance().handle(castedPacket.cmd); @@ -134,20 +127,25 @@ public class OpisPacketHandler implements IPacketHandler { else if (header == Packets.DATA_LIST_GENERAL){ Packet_DataList castedPacket = new Packet_DataList(packet); - if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.TILETENTS)) + if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.TILETENTS)) DataCache.instance().setTimingTileEnts(castedPacket.data); - if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.ENTITIES)) + else if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.ENTITIES)) DataCache.instance().setTimingEntities(castedPacket.data); - if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.HANDLERS)) + else if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.HANDLERS)) DataCache.instance().setTimingHandlers(castedPacket.data); - if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.CHUNK)) + else if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.CHUNK)) DataCache.instance().setTimingChunks(castedPacket.data); - if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.AMOUNT) && (castedPacket.target == DataReq.ENTITIES)) + else if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.AMOUNT) && (castedPacket.target == DataReq.ENTITIES)) DataCache.instance().setAmountEntities(castedPacket.data); + + else if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.CHUNK) && (castedPacket.target == DataReq.ENTITIES)){ + OverlayEntityPerChunk.instance().setEntStats(castedPacket.data); + OverlayEntityPerChunk.instance().setupEntTable(); + } } } diff --git a/mcp/mobius/opis/network/server/Packet_DataList.java b/mcp/mobius/opis/network/server/Packet_DataList.java index 338261e..5e1743c 100644 --- a/mcp/mobius/opis/network/server/Packet_DataList.java +++ b/mcp/mobius/opis/network/server/Packet_DataList.java @@ -79,6 +79,9 @@ public class Packet_DataList { if ((maintype == DataReq.LIST) && (subtype == DataReq.AMOUNT) && (target == DataReq.ENTITIES)) return AmountHolder.readFromStream(istream); + if ((maintype == DataReq.LIST) && (subtype == DataReq.CHUNK) && (target == DataReq.ENTITIES)) + return EntityStats.readFromStream(istream); + } catch (Exception e) { throw new RuntimeException(e); } diff --git a/mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java b/mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java deleted file mode 100644 index f44b695..0000000 --- a/mcp/mobius/opis/network/server/Packet_DataListChunkEntities.java +++ /dev/null @@ -1,53 +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.ArrayList; - -import net.minecraft.network.packet.Packet250CustomPayload; -import mcp.mobius.opis.data.holders.EntityStats; -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){ - Packet250CustomPayload packet = new Packet250CustomPayload(); - 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 00046dd..28adda3 100644 --- a/mcp/mobius/opis/overlay/entperchunk/OverlayEntityPerChunk.java +++ b/mcp/mobius/opis/overlay/entperchunk/OverlayEntityPerChunk.java @@ -18,6 +18,7 @@ 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.gui.events.MouseEvent; import mcp.mobius.opis.gui.interfaces.CType; import mcp.mobius.opis.gui.interfaces.IWidget; @@ -66,6 +67,12 @@ public class OverlayEntityPerChunk implements IMwDataProvider { return _instance; } + public void setEntStats(ArrayList data){ + this.entStats.clear(); + for (ISerializable stat : data) + this.entStats.add((EntityStats)stat); + } + public void reduceData(){ this.reducedData.clear(); for (CoordinatesChunk chunk : this.overlayData.keySet())