Request for Mean time overlay is now handled by a Req packet.

This commit is contained in:
ProfMobius committed 2014-03-19 18:13:36 +01:00
1 parent 578f50fbcb
commit 1301f75d5d
4 files changed
+12 -58

No files matched your search

+8 -1
View File
@@ -30,6 +30,7 @@ import mcp.mobius.opis.network.enums.DataReq;
import mcp.mobius.opis.network.server.Packet_DataList;
import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities;
import mcp.mobius.opis.network.server.Packet_LoadedChunks;
import mcp.mobius.opis.network.server.Packet_MeanTime;
import mcp.mobius.opis.overlay.OverlayStatus;
import mcp.mobius.opis.server.PlayerTracker;
@@ -51,6 +52,12 @@ public class DataReqHandler {
this.handleOverlayChunkEntities((CoordinatesChunk)param1, player);
}
else if ((maintype == DataReq.OVERLAY) && (subtype == DataReq.CHUNK) && (target == DataReq.TIMING)){
PlayerTracker.instance().playerOverlayStatus.put(player, OverlayStatus.MEANTIME);
PlayerTracker.instance().playerDimension.put(player, ((SerializableInt)param1).value);
PacketDispatcher.sendPacketToPlayer(Packet_MeanTime.create(TileEntityManager.getTimes(((SerializableInt)param1).value), ((SerializableInt)param1).value), player);
}
else if ((maintype == DataReq.LIST) && (subtype == DataReq.CHUNK) && (target == DataReq.ENTITIES)){
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.CHUNK, DataReq.ENTITIES, EntityManager.getEntitiesInChunk((CoordinatesChunk)param1)), (Player)player);
}
@@ -59,7 +66,7 @@ public class DataReqHandler {
PlayerTracker.instance().playerOverlayStatus.put(player, OverlayStatus.CHUNKSTATUS);
PlayerTracker.instance().playerDimension.put(player, ((SerializableInt)param1).value);
PacketDispatcher.sendPacketToPlayer(Packet_LoadedChunks.create(ChunkManager.getLoadedChunks(((SerializableInt)param1).value)), player);
}
}
else if ((maintype == DataReq.LIST) && (subtype == DataReq.TIMING) && (target == DataReq.TILETENTS)){
ArrayList<TileEntityStats> timingTileEnts = TileEntityManager.getTopEntities(100);
+1 -11
View File
@@ -18,7 +18,6 @@ import mcp.mobius.opis.data.managers.EntityManager;
import mcp.mobius.opis.data.managers.TileEntityManager;
import mcp.mobius.opis.network.client.Packet_ReqChunks;
import mcp.mobius.opis.network.client.Packet_ReqData;
import mcp.mobius.opis.network.client.Packet_ReqMeanTimeInDim;
import mcp.mobius.opis.network.client.Packet_ReqTEsInChunk;
import mcp.mobius.opis.network.client.Packet_ReqTickets;
import mcp.mobius.opis.network.enums.DataReq;
@@ -145,16 +144,7 @@ public class OpisPacketHandler implements IPacketHandler {
}
void onPacketToServer(INetworkManager manager, Packet250CustomPayload packet, Player player, Byte header) {
if (header == Packets.REQ_MEANTIME_IN_DIM){
Packet_ReqMeanTimeInDim castedPacket = new Packet_ReqMeanTimeInDim(packet);
if (this.isOp(player)){
PlayerTracker.instance().playerOverlayStatus.put(player, OverlayStatus.MEANTIME);
PlayerTracker.instance().playerDimension.put(player, castedPacket.dimension);
PacketDispatcher.sendPacketToPlayer(Packet_MeanTime.create(TileEntityManager.getTimes(castedPacket.dimension), castedPacket.dimension), player);
}
}
else if (header == Packets.REQ_TES_IN_CHUNK){
if (header == Packets.REQ_TES_IN_CHUNK){
Packet_ReqTEsInChunk castedPacket = new Packet_ReqTEsInChunk(packet);
if (this.isOp(player)){
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.CHUNK, DataReq.TILETENTS, TileEntityManager.getInChunk(castedPacket.chunk)), player);
@@ -1,43 +0,0 @@
package mcp.mobius.opis.network.client;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import mcp.mobius.opis.network.Packets;
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;
}
}
+3 -3
View File
@@ -22,6 +22,7 @@ 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.SerializableInt;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.data.managers.ChunkManager;
import mcp.mobius.opis.gui.events.MouseEvent;
@@ -35,7 +36,6 @@ import mcp.mobius.opis.gui.widgets.tableview.TableRow;
import mcp.mobius.opis.gui.widgets.tableview.ViewTable;
import mcp.mobius.opis.network.client.Packet_ReqChunks;
import mcp.mobius.opis.network.client.Packet_ReqData;
import mcp.mobius.opis.network.client.Packet_ReqMeanTimeInDim;
import mcp.mobius.opis.network.client.Packet_ReqTEsInChunk;
import mcp.mobius.opis.network.enums.DataReq;
@@ -214,7 +214,7 @@ public class OverlayMeanTime implements IMwDataProvider {
@Override
public void onDimensionChanged(int dimension, MapView mapview) {
PacketDispatcher.sendPacketToServer(Packet_ReqMeanTimeInDim.create(dimension));
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.OVERLAY, DataReq.CHUNK, DataReq.TIMING, new SerializableInt(dimension)));
}
@Override
@@ -228,7 +228,7 @@ public class OverlayMeanTime implements IMwDataProvider {
@Override
public void onOverlayActivated(MapView mapview) {
this.selectedChunk = null;
PacketDispatcher.sendPacketToServer(Packet_ReqMeanTimeInDim.create(mapview.getDimension()));
PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.OVERLAY, DataReq.CHUNK, DataReq.TIMING, new SerializableInt(mapview.getDimension())));
}
@Override