mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-19 19:59:37 +00:00
TileEntitiesChunkList is now included in the general Data scheme.
This commit is contained in:
1 parent
9f9c6c32fa
commit
cc98c31bb0
5 files changed
+18
-66
No files matched your search
@@ -107,13 +107,15 @@ public class DataReqHandler {
|
||||
|
||||
if (subtype == DataReq.UNREGISTER){
|
||||
PlayerTracker.instance().playerOverlayStatus.remove(player);
|
||||
PlayerTracker.instance().playerDimension.remove(player);
|
||||
PlayerTracker.instance().playerDimension.remove(player);
|
||||
return;
|
||||
}
|
||||
|
||||
if (subtype == DataReq.START){
|
||||
MetaManager.reset();
|
||||
modOpis.profilerRun = true;
|
||||
ProfilerRegistrar.turnOn();
|
||||
ProfilerRegistrar.turnOn();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,6 @@ 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;
|
||||
import mcp.mobius.opis.network.server.Packet_TileEntitiesChunkList;
|
||||
import mcp.mobius.opis.overlay.OverlayLoadedChunks;
|
||||
import mcp.mobius.opis.overlay.OverlayMeanTime;
|
||||
import mcp.mobius.opis.overlay.OverlayStatus;
|
||||
@@ -82,11 +81,6 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
ChunkManager.chunkMeanTime = castedPacket.chunkStatus;
|
||||
}
|
||||
|
||||
else if (header == Packets.TILEENTITIES_CHUNKLIST){
|
||||
Packet_TileEntitiesChunkList castedPacket = new Packet_TileEntitiesChunkList(packet);
|
||||
OverlayMeanTime.instance().setupTable(castedPacket.entities);
|
||||
}
|
||||
|
||||
else if (header == Packets.TICKETS){
|
||||
Packet_Tickets castedPacket = new Packet_Tickets(packet);
|
||||
OverlayLoadedChunks.instance().setupTable(castedPacket.tickets);
|
||||
@@ -146,6 +140,9 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
OverlayEntityPerChunk.instance().setEntStats(castedPacket.data);
|
||||
OverlayEntityPerChunk.instance().setupEntTable();
|
||||
}
|
||||
else if ((castedPacket.maintype == DataReq.LIST) && (castedPacket.subtype == DataReq.CHUNK) && (castedPacket.target == DataReq.TILETENTS)){
|
||||
OverlayMeanTime.instance().setupTable(castedPacket.data);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -170,7 +167,7 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
else if (header == Packets.REQ_TES_IN_CHUNK){
|
||||
Packet_ReqTEsInChunk castedPacket = new Packet_ReqTEsInChunk(packet);
|
||||
if (this.isOp(player)){
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_TileEntitiesChunkList.create(TileEntityManager.getInChunk(castedPacket.chunk)), player);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.CHUNK, DataReq.TILETENTS, TileEntityManager.getInChunk(castedPacket.chunk)), player);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -80,7 +80,10 @@ public class Packet_DataList {
|
||||
return AmountHolder.readFromStream(istream);
|
||||
|
||||
if ((maintype == DataReq.LIST) && (subtype == DataReq.CHUNK) && (target == DataReq.ENTITIES))
|
||||
return EntityStats.readFromStream(istream);
|
||||
return EntityStats.readFromStream(istream);
|
||||
|
||||
if ((maintype == DataReq.LIST) && (subtype == DataReq.CHUNK) && (target == DataReq.TILETENTS))
|
||||
return TileEntityStats.readFromStream(istream);
|
||||
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
|
||||
@@ -1,52 +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 java.util.Collections;
|
||||
|
||||
import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import mcp.mobius.opis.network.Packets;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
public class Packet_TileEntitiesChunkList {
|
||||
|
||||
public byte header;
|
||||
public ArrayList<TileEntityStats> entities = new ArrayList<TileEntityStats>();
|
||||
|
||||
public Packet_TileEntitiesChunkList(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
|
||||
try{
|
||||
this.header = inputStream.readByte();
|
||||
int ndata = inputStream.readInt();
|
||||
for (int i = 0; i < ndata; i++)
|
||||
entities.add(TileEntityStats.readFromStream(inputStream));
|
||||
} catch (IOException e){}
|
||||
}
|
||||
|
||||
public static Packet250CustomPayload create(ArrayList<TileEntityStats> stats){
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
Collections.sort(stats);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(Packets.TILEENTITIES_CHUNKLIST);
|
||||
outputStream.writeInt(stats.size());
|
||||
for (TileEntityStats data : stats)
|
||||
data.writeToStream(outputStream);
|
||||
}catch(IOException e){}
|
||||
|
||||
packet.channel = "Opis";
|
||||
packet.data = bos.toByteArray();
|
||||
packet.length = bos.size();
|
||||
|
||||
return packet;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -21,6 +21,7 @@ import mapwriter.map.mapmode.MapMode;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.holders.CoordinatesBlock;
|
||||
import mcp.mobius.opis.data.holders.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.TileEntityStats;
|
||||
import mcp.mobius.opis.data.managers.ChunkManager;
|
||||
import mcp.mobius.opis.gui.events.MouseEvent;
|
||||
@@ -258,7 +259,7 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void setupTable(ArrayList<TileEntityStats> entities){
|
||||
public void setupTable(ArrayList<ISerializable> entities){
|
||||
if (this.canvas == null)
|
||||
this.canvas = new LayoutCanvas();
|
||||
|
||||
@@ -276,9 +277,10 @@ public class OverlayMeanTime implements IMwDataProvider {
|
||||
.setColumnsWidth(50,25,25)
|
||||
.setRowColors(0xff808080, 0xff505050)
|
||||
.setFontSize(1.0f);
|
||||
|
||||
|
||||
for (TileEntityStats data : entities){
|
||||
|
||||
for (ISerializable uncasted : entities){
|
||||
|
||||
TileEntityStats data = (TileEntityStats)uncasted;
|
||||
|
||||
ItemStack is;
|
||||
String name = String.format("te.%d.%d", data.getID(), data.getMeta());
|
||||
|
||||
Reference in new issue
Block a user